diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 05:30:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 05:30:00 +0000 |
| commit | ee355114ec6062d00c1376b184b886a39e74fd4e (patch) | |
| tree | da9330872894208b121ac18e2abbc801b67f1509 /arch | |
| parent | d1003cbd87479d4962fe017c0f913dde9c4d026a (diff) | |
Merge with Linux 2.4.0-test6-pre9.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/i386_ksyms.c | 13 | ||||
| -rw-r--r-- | arch/i386/lib/Makefile | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/arch/i386/kernel/i386_ksyms.c b/arch/i386/kernel/i386_ksyms.c index c11ab01f2..ed3573426 100644 --- a/arch/i386/kernel/i386_ksyms.c +++ b/arch/i386/kernel/i386_ksyms.c @@ -12,6 +12,7 @@ #include <linux/pci.h> #include <linux/apm_bios.h> #include <linux/kernel.h> +#include <linux/string.h> #include <asm/semaphore.h> #include <asm/processor.h> @@ -24,6 +25,7 @@ #include <asm/irq.h> #include <asm/mmx.h> #include <asm/desc.h> +#include <asm/pgtable.h> extern void dump_thread(struct pt_regs *, struct user *); extern spinlock_t rtc_lock; @@ -142,3 +144,14 @@ EXPORT_SYMBOL(screen_info); EXPORT_SYMBOL(get_wchan); EXPORT_SYMBOL(rtc_lock); + +#undef memcpy +#undef memset +extern void * memset(void *,int,__kernel_size_t); +extern void * memcpy(void *,const void *,__kernel_size_t); +EXPORT_SYMBOL_NOVERS(memcpy); +EXPORT_SYMBOL_NOVERS(memset); + +#ifdef CONFIG_X86_PAE +EXPORT_SYMBOL(empty_zero_page); +#endif diff --git a/arch/i386/lib/Makefile b/arch/i386/lib/Makefile index 30e9a207c..abafc528d 100644 --- a/arch/i386/lib/Makefile +++ b/arch/i386/lib/Makefile @@ -7,7 +7,8 @@ L_TARGET = lib.a L_OBJS = checksum.o old-checksum.o delay.o \ - usercopy.o getuser.o putuser.o iodebug.o + usercopy.o getuser.o putuser.o iodebug.o \ + memcpy.o ifdef CONFIG_X86_USE_3DNOW L_OBJS += mmx.o |