diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 14:00:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 14:00:45 +0200 |
| commit | 59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1 (patch) | |
| tree | 2ffc3f2ce655806424d022f3a4daec7665ab888f /include/asm-parisc/sections.h | |
| parent | ec70cae8698632917f06110fdb70c6364281ecc6 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | op-kernel-dev-59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1.zip op-kernel-dev-59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1.tar.gz | |
Merge commit 'v2.6.27-rc6' into x86/unify-cpu-detect
Conflicts:
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/common_64.c
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-parisc/sections.h')
| -rw-r--r-- | include/asm-parisc/sections.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-parisc/sections.h b/include/asm-parisc/sections.h index fdd43ec..9d13c35 100644 --- a/include/asm-parisc/sections.h +++ b/include/asm-parisc/sections.h @@ -4,4 +4,9 @@ /* nothing to see, move along */ #include <asm-generic/sections.h> +#ifdef CONFIG_64BIT +#undef dereference_function_descriptor +void *dereference_function_descriptor(void *); +#endif + #endif |
