Move linux 2.6.11 workaround to generic code