diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /arch/arm | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 6 | ||||
| -rw-r--r-- | arch/arm/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/bios32.c | 5 | ||||
| -rw-r--r-- | arch/arm/kernel/calls.S | 11 |
4 files changed, 16 insertions, 8 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index a9d71cb7b..8a100eb77 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -6,7 +6,7 @@ HEAD = head.o OBJS = misc.o SYSTEM = $(TOPDIR)/vmlinux -CFLAGS = -O2 -DSTDC_HEADERS $(CFLAGS_PROC) +CFLAGS = $(CPPFLAGS) -O2 -DSTDC_HEADERS $(CFLAGS_PROC) FONTC = $(TOPDIR)/drivers/video/font_acorn_8x8.c ZLDFLAGS = -p -X -T vmlinux.lds @@ -77,7 +77,7 @@ vmlinux: $(HEAD) $(OBJS) piggy.o vmlinux.lds $(LD) $(ZLDFLAGS) $(HEAD) $(OBJS) piggy.o $(GCCLIB) -o vmlinux $(HEAD): $(HEAD:.o=.S) - $(CC) -traditional -c $(HEAD:.o=.S) + $(CC) $(AFLAGS) -traditional -c $(HEAD:.o=.S) piggy.o: $(SYSTEM) $(OBJCOPY) $(SYSTEM) piggy @@ -86,7 +86,7 @@ piggy.o: $(SYSTEM) rm -f piggy piggy.gz font.o: $(FONTC) - $(CC) -Dstatic= -c -o $@ $(FONTC) + $(CC) $(CFLAGS) -Dstatic= -c -o $@ $(FONTC) vmlinux.lds: vmlinux.lds.in @sed "$(SEDFLAGS)" < vmlinux.lds.in > $@ diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 31ca81ddc..3b79f080b 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -75,7 +75,7 @@ else endif $(HEAD_OBJ): $(HEAD_OBJ:.o=.S) - $(CC) -D__ASSEMBLY__ -DTEXTADDR=$(TEXTADDR) -traditional -c $(HEAD_OBJ:.o=.S) -o $@ + $(CC) -D__ASSEMBLY__ $(AFLAGS) -DTEXTADDR=$(TEXTADDR) -traditional -c $(HEAD_OBJ:.o=.S) -o $@ include $(TOPDIR)/Rules.make diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 041d4f4ed..b9b7d57b4 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -24,7 +24,7 @@ void pcibios_report_device_errors(void) { struct pci_dev *dev; - for (dev = pci_devices; dev; dev = dev->next) { + pci_for_each_dev(dev) { u16 status; pci_read_config_word(dev, PCI_STATUS, &status); @@ -121,11 +121,12 @@ static void __init pcibios_claim_resources(void) struct pci_dev *dev; int idx; - for (dev = pci_devices; dev; dev = dev->next) + pci_for_each_dev(dev) { for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) if (dev->resource[idx].flags && dev->resource[idx].start) pci_claim_resource(dev, idx); + } } void __init diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index c95eeb1b0..51f3dcde2 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S @@ -85,7 +85,7 @@ .long SYMBOL_NAME(sys_sigpending) .long SYMBOL_NAME(sys_sethostname) /* 75 */ .long SYMBOL_NAME(sys_setrlimit) - .long SYMBOL_NAME(sys_getrlimit) + .long SYMBOL_NAME(sys_old_getrlimit) .long SYMBOL_NAME(sys_getrusage) .long SYMBOL_NAME(sys_gettimeofday) .long SYMBOL_NAME(sys_settimeofday) @@ -200,8 +200,15 @@ .long SYMBOL_NAME(sys_ni_syscall) .long SYMBOL_NAME(sys_ni_syscall) /* 190 */ .long SYMBOL_NAME(sys_vfork_wrapper) + .long SYMBOL_NAME(sys_getrlimit) + .long SYMBOL_NAME(sys_mmap2) + .long SYMBOL_NAME(sys_truncate64) + .long SYMBOL_NAME(sys_ftruncate64) +/* 195 */ .long SYMBOL_NAME(sys_stat64) + .long SYMBOL_NAME(sys_lstat64) + .long SYMBOL_NAME(sys_fstat64) - .rept NR_syscalls-186 + .rept NR_syscalls-197 .long SYMBOL_NAME(sys_ni_syscall) .endr #endif |