diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
commit | 9a64388d83f6ef08dfff405a9d122e3dbcb6bf38 (patch) | |
tree | a77532ce4d6d56be6c6c7f405cd901a0184250fb /arch/powerpc/kernel/ppc_ksyms.c | |
parent | e80ab411e589e00550e2e6e5a6a02d59cc730357 (diff) | |
parent | 14b3ca4022f050f8622ed282b734ddf445464583 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits)
[POWERPC] Fix compile breakage for 64-bit UP configs
[POWERPC] Define copy_siginfo_from_user32
[POWERPC] Add compat handler for PTRACE_GETSIGINFO
[POWERPC] i2c: Fix build breakage introduced by OF helpers
[POWERPC] Optimize fls64() on 64-bit processors
[POWERPC] irqtrace support for 64-bit powerpc
[POWERPC] Stacktrace support for lockdep
[POWERPC] Move stackframe definitions to common header
[POWERPC] Fix device-tree locking vs. interrupts
[POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const
[POWERPC] Remove unused __max_memory variable
[POWERPC] Simplify xics direct/lpar irq_host setup
[POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ()
[POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()
[POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c
[POWERPC] Use asm-generic/bitops/find.h in bitops.h
[POWERPC] 83xx: mpc8315 - fix USB UTMI Host setup
[POWERPC] 85xx: Fix the size of qe muram for MPC8568E
[POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier.
[POWERPC] 86xx: mark functions static, other minor cleanups
...
Diffstat (limited to 'arch/powerpc/kernel/ppc_ksyms.c')
-rw-r--r-- | arch/powerpc/kernel/ppc_ksyms.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index 65d14e6ddc3c..09fcb50c45ae 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c | |||
@@ -44,10 +44,6 @@ | |||
44 | #include <asm/signal.h> | 44 | #include <asm/signal.h> |
45 | #include <asm/dcr.h> | 45 | #include <asm/dcr.h> |
46 | 46 | ||
47 | #ifdef CONFIG_PPC64 | ||
48 | EXPORT_SYMBOL(local_irq_restore); | ||
49 | #endif | ||
50 | |||
51 | #ifdef CONFIG_PPC32 | 47 | #ifdef CONFIG_PPC32 |
52 | extern void transfer_to_handler(void); | 48 | extern void transfer_to_handler(void); |
53 | extern void do_IRQ(struct pt_regs *regs); | 49 | extern void do_IRQ(struct pt_regs *regs); |
@@ -57,7 +53,6 @@ extern void program_check_exception(struct pt_regs *regs); | |||
57 | extern void single_step_exception(struct pt_regs *regs); | 53 | extern void single_step_exception(struct pt_regs *regs); |
58 | extern int sys_sigreturn(struct pt_regs *regs); | 54 | extern int sys_sigreturn(struct pt_regs *regs); |
59 | 55 | ||
60 | EXPORT_SYMBOL(empty_zero_page); | ||
61 | EXPORT_SYMBOL(clear_pages); | 56 | EXPORT_SYMBOL(clear_pages); |
62 | EXPORT_SYMBOL(copy_page); | 57 | EXPORT_SYMBOL(copy_page); |
63 | EXPORT_SYMBOL(ISA_DMA_THRESHOLD); | 58 | EXPORT_SYMBOL(ISA_DMA_THRESHOLD); |
@@ -78,6 +73,7 @@ EXPORT_SYMBOL(strncpy); | |||
78 | EXPORT_SYMBOL(strcat); | 73 | EXPORT_SYMBOL(strcat); |
79 | EXPORT_SYMBOL(strlen); | 74 | EXPORT_SYMBOL(strlen); |
80 | EXPORT_SYMBOL(strcmp); | 75 | EXPORT_SYMBOL(strcmp); |
76 | EXPORT_SYMBOL(strncmp); | ||
81 | 77 | ||
82 | EXPORT_SYMBOL(csum_partial); | 78 | EXPORT_SYMBOL(csum_partial); |
83 | EXPORT_SYMBOL(csum_partial_copy_generic); | 79 | EXPORT_SYMBOL(csum_partial_copy_generic); |
@@ -191,3 +187,4 @@ EXPORT_SYMBOL(intercept_table); | |||
191 | EXPORT_SYMBOL(__mtdcr); | 187 | EXPORT_SYMBOL(__mtdcr); |
192 | EXPORT_SYMBOL(__mfdcr); | 188 | EXPORT_SYMBOL(__mfdcr); |
193 | #endif | 189 | #endif |
190 | EXPORT_SYMBOL(empty_zero_page); | ||