diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/arm/lib | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/Makefile | 6 | ||||
| -rw-r--r-- | arch/arm/lib/getconsdata.c | 10 | ||||
| -rw-r--r-- | arch/arm/lib/io.c | 7 | ||||
| -rw-r--r-- | arch/arm/lib/semaphore.S | 34 |
4 files changed, 17 insertions, 40 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 0b241d333..7f5ff3012 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -5,8 +5,8 @@ # L_TARGET := lib.a -L_OBJS := backtrace.o bitops.o checksum.o delay.o io.o memcpy.o \ - semaphore.o string.o system.o uaccess.o +L_OBJS := backtrace.o bitops.o checksum.o delay.o memcpy.o \ + string.o system.o uaccess.o ifeq ($(PROCESSOR),armo) L_OBJS += uaccess-armo.o @@ -24,6 +24,8 @@ endif ifeq ($(MACHINE),ebsa110) L_OBJS += io-ebsa110.o +else + LX_OBJS += io.o endif ifeq ($(MACHINE),footbridge) diff --git a/arch/arm/lib/getconsdata.c b/arch/arm/lib/getconsdata.c index 27f4ca2ef..9c317b639 100644 --- a/arch/arm/lib/getconsdata.c +++ b/arch/arm/lib/getconsdata.c @@ -32,11 +32,13 @@ unsigned long TSK_USED_MATH = OFF_TSK(used_math); unsigned long MM = OFF_TSK(mm); unsigned long PGD = OFF_MM(pgd); -unsigned long TSS_MEMMAP = OFF_TSK(tss.memmap); -unsigned long TSS_SAVE = OFF_TSK(tss.save); -unsigned long TSS_FPESAVE = OFF_TSK(tss.fpstate.soft.save); +unsigned long TSS_SAVE = OFF_TSK(thread.save); +unsigned long TSS_FPESAVE = OFF_TSK(thread.fpstate.soft.save); #ifdef CONFIG_CPU_26 -unsigned long TSS_MEMCMAP = OFF_TSK(tss.memcmap); +unsigned long TSS_MEMMAP = OFF_TSK(thread.memmap); +unsigned long TSS_MEMCMAP = OFF_TSK(thread.memcmap); +#elif defined(CONFIG_CPU_32) +unsigned long TSS_DOMAIN = OFF_TSK(thread.domain); #endif #ifdef _PAGE_PRESENT diff --git a/arch/arm/lib/io.c b/arch/arm/lib/io.c index c94a2ba07..a7720eca1 100644 --- a/arch/arm/lib/io.c +++ b/arch/arm/lib/io.c @@ -1,3 +1,5 @@ +#include <linux/module.h> + #include <asm/io.h> /* @@ -40,3 +42,8 @@ void _memset_io(unsigned long dst, int c, unsigned long count) dst++; } } + +EXPORT_SYMBOL(_memcpy_fromio); +EXPORT_SYMBOL(_memcpy_toio); +EXPORT_SYMBOL(_memset_io); + diff --git a/arch/arm/lib/semaphore.S b/arch/arm/lib/semaphore.S deleted file mode 100644 index 778fafc1c..000000000 --- a/arch/arm/lib/semaphore.S +++ /dev/null @@ -1,34 +0,0 @@ -/* - * linux/arch/arm/lib/semaphore.S - * - * Idea from i386 code, Copyright Linus Torvalds. - * Converted for ARM by Russell King - */ -#include <linux/linkage.h> -#include <asm/assembler.h> - -/* - * The semaphore operations have a special calling sequence - * that allows us to keep the distruption of the main code - * path to a minimum. These routines save and restore the - * registers that will be touched by __down etc. - */ -ENTRY(__down_failed) - stmfd sp!, {r0 - r3, ip, lr} - bl SYMBOL_NAME(__down) - LOADREGS(fd, sp!, {r0 - r3, ip, pc}) - -ENTRY(__down_interruptible_failed) - stmfd sp!, {r1 - r3, ip, lr} - bl SYMBOL_NAME(__down_interruptible) - LOADREGS(fd, sp!, {r1 - r3, ip, pc}) - -ENTRY(__down_trylock_failed) - stmfd sp!, {r1 - r3, ip, lr} - bl SYMBOL_NAME(__down_trylock) - LOADREGS(fd, sp!, {r1 - r3, ip, pc}) - -ENTRY(__up_wakeup) - stmfd sp!, {r0 - r3, ip, lr} - bl SYMBOL_NAME(__up) - LOADREGS(fd, sp!, {r0 - r3, ip, pc}) |