Merge bk://ppc.bkbits.net/for-linus-ppc

into home.transmeta.com:/home/torvalds/v2.5/linux

arch/ppc/Kconfig

@@ -1314,6 +1314,17 @@ config BOOT_LOAD
 	depends on BOOT_LOAD_BOOL
 	default "0x00400000"
 
+# If we don't have a custom load, we define one here depending.
+config BOOT_LOAD
+	hex
+	depends on !BOOT_LOAD_BOOL && (40x || 8xx || 8260)
+	default "0x00400000"
+
+config BOOT_LOAD
+	hex
+	depends on !BOOT_LOAD_BOOL
+	default "0x00800000"
+
 endmenu
 
 source "drivers/mtd/Kconfig"

arch/ppc/Makefile

@@ -36,19 +36,13 @@ ifdef CONFIG_MORE_COMPILE_OPTIONS
   CFLAGS += $(shell echo $(CONFIG_COMPILE_OPTIONS) | sed -e 's/"//g')
 endif
 
-ifdef CONFIG_4xx
-  HEAD := arch/ppc/kernel/head_4xx.o
-else
-  ifdef CONFIG_8xx
-    HEAD := arch/ppc/kernel/head_8xx.o
-  else
-    ifdef CONFIG_PPC_ISERIES
-      HEAD := arch/ppc/kernel/iSeries_head.o
-    else
-      HEAD := arch/ppc/kernel/head.o
-    endif
-  endif
-endif
+head-y				:= head.o
+head-$(CONFIG_PPC_ISERIES)	:= iSeries_head.o
+head-$(CONFIG_8xx)		:= head_8xx.o
+head-$(CONFIG_4xx)		:= head_4xx.o
+head-$(CONFIG_440)		:= head_44x.o
+
+HEAD := arch/ppc/kernel/$(head-y)
 
 core-y				+= arch/ppc/kernel/ arch/ppc/platforms/ \
 				   arch/ppc/mm/ arch/ppc/lib/ arch/ppc/syslib/
@@ -80,7 +74,7 @@ $(BOOT_TARGETS): vmlinux
 	cp -f arch/ppc/configs/$(@:config=defconfig) .config
 
 archclean:
-	$(MAKE) -f scripts/Makefile.clean obj=arch/ppc/boot
+	+$(MAKE) -f scripts/Makefile.clean obj=arch/ppc/boot
 
 archmrproper:
 

arch/ppc/boot/Makefile

@@ -10,19 +10,17 @@
 # modified by Cort (cort@cs.nmt.edu)
 #
 
-CFLAGS	+= -fno-builtin -D__BOOTER__ -I$(TOPDIR)/arch/$(ARCH)/boot/include
+CFLAGS	+= -fno-builtin -D__BOOTER__ -Iarch/$(ARCH)/boot/include
 
-AFLAGS	+= -D__BOOTER__
-OBJCOPY_ARGS = -O elf32-powerpc
+BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd
 
 bootdir-y			:= simple
 bootdir-$(CONFIG_ALL_PPC)	:= openfirmware prep
+subdir-y			:= lib common images
+subdir-$(CONFIG_ALL_PPC)	+= of1275
 
-# for cleaning...
-subdir-				:= images simple openfirmware prep \
-				   lib common of1275
-
-HOSTCFLAGS += -Iarch/$(ARCH)/boot/include
+# for cleaning
+subdir-				+= simple openfirmware prep
 
 tools-$(CONFIG_ALL_PPC)		:= addnote mknote hack-coff mkprep
 tools-$(CONFIG_PPLUS)		:= mkbugboot mkprep
@@ -39,15 +37,9 @@ all-tools := addnote mknote hack-coff mkprep mkbugboot mktree
 
 host-progs			:= $(addprefix utils/,$(tools-y))
 
-zImage zImage.initrd znetboot znetboot.initrd: $(addprefix $(obj)/,$(bootdir-y))
-
-.PHONY: FORCE
-
-$(obj)/simple $(obj)/openfirmware $(obj)/prep: $(obj)/lib $(obj)/common $(obj)/images
-$(obj)/openfirmware $(obj)/prep: $(obj)/of1275
+.PHONY: $(BOOT_TARGETS) $(bootdir-y)
 
-$(obj)/lib $(obj)/common $(obj)/of1275 $(obj)/images: FORCE
-	+@$(call descend,$@,)
+$(BOOT_TARGETS): $(bootdir-y)
 
-$(obj)/openfirmware $(obj)/prep $(obj)/simple: FORCE
-	+@$(call descend,$@,$(MAKECMDGOALS))
+$(bootdir-y): $(addprefix $(obj)/,$(subdir-y))
+	+$(call descend,$(obj)/$@,$(MAKECMDGOALS))

arch/ppc/boot/common/Makefile

@@ -15,5 +15,3 @@ obj-$(CONFIG_ALL_PPC)			+= mpc10x_memory.o
 obj-$(CONFIG_LOPEC)			+= mpc10x_memory.o
 obj-$(CONFIG_PAL4)			+= cpc700_memory.o
 obj-$(CONFIG_SERIAL_8250_CONSOLE)	+= ns16550.o
-
-include $(TOPDIR)/Rules.make

arch/ppc/boot/images/Makefile

@@ -10,6 +10,5 @@ $(obj)/vmlinux.gz: vmlinux
 	$(OBJCOPY) -O binary $< $(@:.gz=)
 	gzip $(GZIP_FLAGS) $(@:.gz=)
 
-clean:
-	rm -f $(obj)/sImage $(obj)/vmapus $(obj)/vmlinux* $(obj)/miboot* 
-	rm -f $(obj)/zImage* z$(obj)/vmlinux*
+# Files generated that shall be removed upon make clean
+clean-files	:= sImage vmapus vmlinux* miboot* zImage*

arch/ppc/boot/lib/Makefile

@@ -5,5 +5,3 @@
 L_TARGET := lib.a
 
 obj-y := zlib.o div64.o
-
-include $(TOPDIR)/Rules.make

arch/ppc/boot/of1275/Makefile

@@ -6,5 +6,3 @@ L_TARGET := lib.a
 
 obj-y := claim.o enter.o exit.o finddevice.o getprop.o ofinit.o	\
 	 ofstdio.o read.o release.o write.o
-
-include $(TOPDIR)/Rules.make

arch/ppc/boot/openfirmware/Makefile

@@ -10,13 +10,10 @@
 #	Merged 'chrp' and 'pmac' into 'openfirmware', and cleaned up the
 #	rules.
 
-EXTRA_TARGETS := start.o misc.o crt0.o coffcrt0.o coffmain.o chrpmain.o \
-		newworldmain.o common.o
+clean-files := note coffboot coffboot.initrd
 
 boot: zImage
 
-include $(TOPDIR)/Rules.make
-
 boot := arch/ppc/boot
 common := $(boot)/common
 utils := $(boot)/utils
@@ -38,8 +35,6 @@ LIBS = lib/lib.a $(bootlib)/lib.a $(of1275)/lib.a $(common)/lib.a
 
 ADDNOTE := $(utils)/addnote
 MKNOTE := $(utils)/mknote
-SIZE := $(utils)/size
-OFFSET := $(utils)/offset
 HACKCOFF := $(utils)/hack-coff
 
 ifdef CONFIG_SMP
@@ -109,12 +104,12 @@ $(obj)/coffboot.initrd: $(COFFOBJS) $(obj)/image-initrd.o $(LIBS)
 	$(LD) -o $@ $(COFF_LD_ARGS) $^
 	$(OBJCOPY) $@ $@ -R .comment
 
-$(images)/vmlinux.coff: $(obj)/coffboot
+$(images)/vmlinux.coff: $(obj)/coffboot $(HACKCOFF)
 	$(OBJCOPY) $(OBJCOPY_ARGS) $(obj)/coffboot $@
 	$(HACKCOFF) $@
 	ln -sf vmlinux.coff $(images)/zImage.pmac
 
-$(images)/vmlinux.initrd.coff: $(obj)/coffboot.initrd
+$(images)/vmlinux.initrd.coff: $(obj)/coffboot.initrd $(HACKCOFF)
 	$(OBJCOPY) $(OBJCOPY_ARGS) $(obj)/coffboot.initrd $@
 	$(HACKCOFF) $@
 	ln -sf vmlinux.initrd.coff $(images)/zImage.initrd.pmac
@@ -139,11 +134,11 @@ $(images)/zImage.initrd.chrp: $(CHRPOBJS) $(obj)/image-initrd.o $(LIBS)
 	$(LD) $(CHRP_LD_ARGS) -o $@ $^
 	$(OBJCOPY) $@ $@ -R .comment
 
-$(images)/zImage.chrp-rs6k: $(images)/zImage.chrp
+$(images)/zImage.chrp-rs6k: $(images)/zImage.chrp $(ADDNOTE)
 	cp $(images)/zImage.chrp $@
 	$(ADDNOTE) $@
 
-$(images)/zImage.initrd.chrp-rs6k: $(images)/zImage.initrd.chrp
+$(images)/zImage.initrd.chrp-rs6k: $(images)/zImage.initrd.chrp $(ADDNOTE)
 	cp $(images)/zImage.initrd.chrp $@
 	$(ADDNOTE) $@
 
@@ -152,6 +147,3 @@ zImage: $(images)/vmlinux.coff $(images)/vmlinux.elf-pmac \
 
 zImage.initrd: $(images)/vmlinux.initrd.coff $(images)/vmlinux.initrd.elf-pmac\
 		$(images)/zImage.initrd.chrp $(images)/miboot.initrd.image
-
-clean:
-	rm -f $(obj)/note $(obj)/image.o $(obj)/coffboot $(obj)/coffboot.initrd

arch/ppc/boot/prep/Makefile

@@ -27,10 +27,6 @@ LIBS 				= $(common)/lib.a $(bootlib)/lib.a
 boot-y				:= head.o misc.o
 boot-$(CONFIG_VGA_CONSOLE)	+= vreset.o kbd.o
 
-EXTRA_TARGETS			:= $(boot-y) ../simple/legacy.o
-
-include $(TOPDIR)/Rules.make
-
 boot := arch/ppc/boot
 common := $(boot)/common
 utils := $(boot)/utils
@@ -43,8 +39,6 @@ OBJS	:= $(addprefix $(obj)/,$(boot-y)) $(simple)/legacy.o
 
 # Tools
 MKPREP				:= $(utils)/mkprep
-SIZE				:= $(utils)/size
-OFFSET				:= $(utils)/offset
 
 # Extra include search dirs
 CFLAGS_kbd.o			+= -Idrivers/char
@@ -55,8 +49,8 @@ zImage.initrd: $(images)/zImage.initrd.prep
 $(obj)/dummy.o: $(common)/dummy.c
 	$(CC) -c -o $@ $(common)/dummy.c
 
-$(images)/zImage.prep: $(OBJS) $(LIBS) $(boot)/ld.script \
-		$(images)/vmlinux.gz $(obj)/dummy.o
+$(images)/zImage.prep: $(OBJS) $(LIBS) $(boot)/ld.script $(images)/vmlinux.gz \
+		$(obj)/dummy.o $(MKPREP)
 	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
 		--add-section=.image=$(images)/vmlinux.gz \
 		--set-section-flags=.image=contents,alloc,load,readonly,data \
@@ -68,7 +62,7 @@ $(images)/zImage.prep: $(OBJS) $(LIBS) $(boot)/ld.script \
 	rm -f $(obj)/zImage
 
 $(images)/zImage.initrd.prep: $(OBJS) $(LIBS) $(boot)/ld.script \
-		$(images)/vmlinux.gz $(obj)/dummy.o
+		$(images)/vmlinux.gz $(obj)/dummy.o $(MKPREP)
 	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
 		--add-section=.ramdisk=$(images)/ramdisk.image.gz \
 		--set-section-flags=.ramdisk=contents,alloc,load,readonly,data \

arch/ppc/boot/prep/misc.c

@@ -8,6 +8,7 @@
  */
 
 #include <linux/types.h>
+#include <linux/string.h>
 #include <asm/residual.h>
 #include <linux/config.h>
 #include <linux/threads.h>

arch/ppc/boot/simple/Makefile

@@ -132,23 +132,9 @@ EXTRA_AFLAGS			:= -Wa,-m405
 EXTRA				:= rw4/rw4_init.o rw4/rw4_init_brd.o
 endif
 
-# Default linker args.  Link at 0x00800000 or 0x00400000 by default, but
-# allow it to be overridden.
-ifeq ($(CONFIG_BOOT_LOAD_BOOL),y)
-LD_ARGS				:= -T $(boot)/ld.script \
-					-Ttext $(CONFIG_BOOT_LOAD) -Bstatic
-else
+# Linker args.  This specifies where the image will be run at.
 LD_ARGS				= -T $(boot)/ld.script \
-					-Ttext 0x00800000 -Bstatic
-ifeq ($(CONFIG_8260)$(CONFIG_40x)$(CONFIG_8xx),y)
-LD_ARGS				:= -T $(boot)/ld.script -Ttext 0x00400000 \
-					-Bstatic
-endif
-ifeq ($(CONFIG_440),y)
-LD_ARGS				:= -T $(boot)/ld.script -Ttext 0x01000000 \
-					-Bstatic
-endif
-endif
+					-Ttext $(CONFIG_BOOT_LOAD) -Bstatic
 OBJCOPY_ARGS			:= -O elf32-powerpc
 
 # head.o and relocate.o must be at the start.
@@ -167,8 +153,7 @@ boot-$(CONFIG_8260)		+= m8260_tty.o
 boot-$(CONFIG_GT64260_CONSOLE)	+= gt64260_tty.o
 endif
 
-EXTRA_TARGETS			:= $(boot-y)
-LIBS				:=  $(common)/lib.a $(bootlib)/lib.a
+LIBS				:= $(common)/lib.a $(bootlib)/lib.a
 
 OBJS				:= $(addprefix $(obj)/,$(boot-y))
 
@@ -181,7 +166,7 @@ $(obj)/dummy.o: $(common)/dummy.c
 	$(CC) -c -o $@ $(common)/dummy.c
 
 $(obj)/zvmlinux: $(OBJS) $(LIBS) $(boot)/ld.script $(images)/vmlinux.gz \
-	$(obj)/dummy.o
+		$(obj)/dummy.o
 	$(OBJCOPY) $(OBJCOPY_ARGS) \
 		--add-section=.image=$(images)/vmlinux.gz \
 		--set-section-flags=.image=contents,alloc,load,readonly,data \

arch/ppc/boot/simple/misc.c

@@ -21,6 +21,7 @@
 #include <linux/types.h>
 #include <linux/elf.h>
 #include <linux/config.h>
+#include <linux/string.h>
 
 #include <asm/page.h>
 #include <asm/processor.h>

arch/ppc/kernel/Makefile

@@ -25,7 +25,7 @@ obj-y				:= entry.o traps.o irq.o idle.o time.o misc.o \
 					cputable.o ppc_htab.o
 obj-$(CONFIG_6xx)		+= l2cr.o ppc6xx_idle.o
 obj-$(CONFIG_ALL_PPC)		+= ppc6xx_idle.o
-obj-$(CONFIG_MODULES)		+= ppc_ksyms.o
+obj-$(CONFIG_MODULES)		+= module.o ppc_ksyms.o
 obj-$(CONFIG_PCI)		+= pci.o 
 ifneq ($(CONFIG_PPC_ISERIES),y)
 obj-$(CONFIG_PCI)		+= pci-dma.o

arch/ppc/kernel/misc.S

@@ -1182,10 +1182,10 @@ _GLOBAL(sys_call_table)
 	.long sys_adjtimex
 	.long sys_mprotect	/* 125 */
 	.long sys_sigprocmask
-	.long sys_create_module
+	.long sys_ni_syscall	/* old sys_create_module */
 	.long sys_init_module
 	.long sys_delete_module
-	.long sys_get_kernel_syms	/* 130 */
+	.long sys_ni_syscall	/* old sys_get_kernel_syms */	/* 130 */
 	.long sys_quotactl
 	.long sys_getpgid
 	.long sys_fchdir
@@ -1221,7 +1221,7 @@ _GLOBAL(sys_call_table)
 	.long sys_mremap
 	.long sys_setresuid
 	.long sys_getresuid	/* 165 */
-	.long sys_query_module
+	.long sys_ni_syscall		/* old sys_query_module */
 	.long sys_poll
 	.long sys_nfsservctl
 	.long sys_setresgid

arch/ppc/kernel/module.c

+/*  Kernel module help for PPC.
+    Copyright (C) 2001 Rusty Russell.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+#include <linux/module.h>
+#include <linux/elf.h>
+#include <linux/vmalloc.h>
+#include <linux/fs.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+
+#if 0
+#define DEBUGP printk
+#else
+#define DEBUGP(fmt , ...)
+#endif
+
+void *module_alloc(unsigned long size)
+{
+	if (size == 0)
+		return NULL;
+	return vmalloc(size);
+}
+
+/* Free memory returned from module_alloc */
+void module_free(struct module *mod, void *module_region)
+{
+	vfree(module_region);
+	/* FIXME: If module_region == mod->init_region, trim exception
+           table entries. */
+}
+
+/* Count how many different relocations (different symbol, different
+   addend) */
+static unsigned int count_relocs(const Elf32_Rela *rela, unsigned int num)
+{
+	unsigned int i, j, ret = 0;
+
+	/* Sure, this is order(n^2), but it's usually short, and not
+           time critical */
+	for (i = 0; i < num; i++) {
+		for (j = 0; j < i; j++) {
+			/* If this addend appeared before, it's
+                           already been counted */
+			if (ELF32_R_SYM(rela[i].r_info)
+			    == ELF32_R_SYM(rela[j].r_info)
+			    && rela[i].r_addend == rela[j].r_addend)
+				break;
+		}
+		if (j == i) ret++;
+	}
+	return ret;
+}
+
+/* Get the potential trampolines size required of the init and
+   non-init sections */
+static unsigned long get_plt_size(const Elf32_Ehdr *hdr,
+				  const Elf32_Shdr *sechdrs,
+				  const char *secstrings,
+				  int is_init)
+{
+	unsigned long ret = 0;
+	unsigned i;
+
+	/* Everything marked ALLOC (this includes the exported
+           symbols) */
+	for (i = 1; i < hdr->e_shnum; i++) {
+		/* If it's called *.init*, and we're not init, we're
+                   not interested */
+		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
+		    != is_init)
+			continue;
+
+		if (sechdrs[i].sh_type == SHT_RELA) {
+			DEBUGP("Found relocations in section %u\n", i);
+			DEBUGP("Ptr: %p.  Number: %u\n",
+			       (void *)hdr + sechdrs[i].sh_offset,
+			       sechdrs[i].sh_size / sizeof(Elf32_Rela));
+			ret += count_relocs((void *)hdr
+					     + sechdrs[i].sh_offset,
+					     sechdrs[i].sh_size
+					     / sizeof(Elf32_Rela))
+				* sizeof(struct ppc_plt_entry);
+		}
+	}
+
+	return ret;
+}
+
+long module_core_size(const Elf32_Ehdr *hdr,
+		      const Elf32_Shdr *sechdrs,
+		      const char *secstrings,
+		      struct module *module)
+{
+	module->arch.core_plt_offset = module->core_size;
+	return module->core_size + get_plt_size(hdr, sechdrs, secstrings, 0);
+}
+
+long module_init_size(const Elf32_Ehdr *hdr,
+		      const Elf32_Shdr *sechdrs,
+		      const char *secstrings,
+		      struct module *module)
+{
+	module->arch.init_plt_offset = module->init_size;
+	return module->init_size + get_plt_size(hdr, sechdrs, secstrings, 1);
+}
+
+int apply_relocate(Elf32_Shdr *sechdrs,
+		   const char *strtab,
+		   unsigned int symindex,
+		   unsigned int relsec,
+		   struct module *module)
+{
+	printk(KERN_ERR "%s: Non-ADD RELOCATION unsupported\n",
+	       module->name);
+	return -ENOEXEC;
+}
+
+static inline int entry_matches(struct ppc_plt_entry *entry, Elf32_Addr val)
+{
+	if (entry->jump[0] == 0x3d600000 + ((val + 0x8000) >> 16)
+	    && entry->jump[1] == 0x396b0000 + (val & 0xffff))
+		return 1;
+	return 0;
+}
+
+/* Set up a trampoline in the PLT to bounce us to the distant function */
+static uint32_t do_plt_call(void *location, Elf32_Addr val, struct module *mod)
+{
+	struct ppc_plt_entry *entry;
+
+	DEBUGP("Doing plt for %u\n", (unsigned int)location);
+	/* Init, or core PLT? */
+	if (location >= mod->module_core
+	    && location < mod->module_core + mod->arch.core_plt_offset)
+		entry = mod->module_core + mod->arch.core_plt_offset;
+	else
+		entry = mod->module_init + mod->arch.init_plt_offset;
+
+	/* Find this entry, or if that fails, the next avail. entry */
+	while (entry->jump[0]) {
+		if (entry_matches(entry, val)) return (uint32_t)entry;
+		entry++;
+	}
+
+	/* Stolen from Paul Mackerras as well... */
+	entry->jump[0] = 0x3d600000+((val+0x8000)>>16);	/* lis r11,sym@ha */
+	entry->jump[1] = 0x396b0000 + (val&0xffff);	/* addi r11,r11,sym@l*/
+	entry->jump[2] = 0x7d6903a6;			/* mtctr r11 */
+	entry->jump[3] = 0x4e800420;			/* bctr */
+
+	return (uint32_t)entry;
+}
+
+int apply_relocate_add(Elf32_Shdr *sechdrs,
+		       const char *strtab,
+		       unsigned int symindex,
+		       unsigned int relsec,
+		       struct module *module)
+{
+	unsigned int i;
+	Elf32_Rela *rela = (void *)sechdrs[relsec].sh_offset;
+	Elf32_Sym *sym;
+	uint32_t *location;
+	uint32_t value;
+
+	DEBUGP("Applying ADD relocate section %u to %u\n", relsec,
+	       sechdrs[relsec].sh_info);
+	for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rela); i++) {
+		/* This is where to make the change */
+		location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_offset
+			+ rela[i].r_offset;
+		/* This is the symbol it is referring to */
+		sym = (Elf32_Sym *)sechdrs[symindex].sh_offset
+			+ ELF32_R_SYM(rela[i].r_info);
+		if (!sym->st_value) {
+			printk(KERN_WARNING "%s: Unknown symbol %s\n",
+			       module->name, strtab + sym->st_name);
+			return -ENOENT;
+		}
+		/* `Everything is relative'. */
+		value = sym->st_value + rela[i].r_addend;
+
+		switch (ELF32_R_TYPE(rela[i].r_info)) {
+		case R_PPC_ADDR32:
+			/* Simply set it */
+			*(uint32_t *)location = value;
+			break;
+
+		case R_PPC_ADDR16_LO:
+			/* Low half of the symbol */
+			*(uint16_t *)location = value;
+			break;
+			
+		case R_PPC_ADDR16_HA:
+			/* Sign-adjusted lower 16 bits: PPC ELF ABI says:
+			   (((x >> 16) + ((x & 0x8000) ? 1 : 0))) & 0xFFFF.
+			   This is the same, only sane.
+			 */
+			*(uint16_t *)location = (value + 0x8000) >> 16;
+			break;
+
+		case R_PPC_REL24:
+			if ((int)(value - (uint32_t)location) < -0x02000000
+			    || (int)(value - (uint32_t)location) >= 0x02000000)
+				value = do_plt_call(location, value, module);
+
+			/* Only replace bits 2 through 26 */
+			DEBUGP("REL24 value = %08X. location = %08X\n",
+			       value, (uint32_t)location);
+			DEBUGP("Location before: %08X.\n",
+			       *(uint32_t *)location);
+			*(uint32_t *)location 
+				= (*(uint32_t *)location & ~0x03fffffc)
+				| ((value - (uint32_t)location)
+				   & 0x03fffffc);
+			DEBUGP("Location after: %08X.\n",
+			       *(uint32_t *)location);
+			DEBUGP("ie. jump to %08X+%08X = %08X\n",
+			       *(uint32_t *)location & 0x03fffffc,
+			       (uint32_t)location,
+			       (*(uint32_t *)location & 0x03fffffc)
+			       + (uint32_t)location);
+			break;
+
+		case R_PPC_REL32:
+			/* 32-bit relative jump. */
+			*(uint32_t *)location = value - (uint32_t)location;
+			break;
+
+		default:
+			printk("%s: unknown ADD relocation: %u\n",
+			       module->name,
+			       ELF32_R_TYPE(rela[i].r_info));
+			return -ENOEXEC;
+		}
+	}
+	return 0;
+}
+
+/* FIXME: Sort exception table --RR */
+int module_finalize(const Elf_Ehdr *hdr,
+		    const Elf_Shdr *sechdrs,
+		    struct module *me)
+{
+	return 0;
+}

arch/ppc/mm/extable.c

@@ -70,24 +70,29 @@ search_one_table(const struct exception_table_entry *first,
 unsigned long
 search_exception_table(unsigned long addr)
 {
-	unsigned long ret;
+	unsigned long ret = 0;
 
 #ifndef CONFIG_MODULES
 	/* There is only the kernel to search.  */
 	ret = search_one_table(__start___ex_table, __stop___ex_table-1, addr);
-	if (ret) return ret;
 #else
-	/* The kernel is the last "module" -- no need to treat it special.  */
-	struct module *mp;
-	for (mp = module_list; mp != NULL; mp = mp->next) {
-		if (mp->ex_table_start == NULL)
+	unsigned long flags;
+	struct list_head *i;
+
+	/* The kernel is the last "module" -- no need to treat it special. */
+	spin_lock_irqsave(&modlist_lock, flags);
+	list_for_each(i, &extables) {
+		struct exception_table *ex
+			= list_entry(i, struct exception_table, list);
+		if (ex->num_entries == 0)
 			continue;
-		ret = search_one_table(mp->ex_table_start,
-				       mp->ex_table_end - 1, addr);
+		ret = search_one_table(ex->entry,
+				       ex->entry + ex->num_entries - 1, addr);
 		if (ret)
-			return ret;
+			break;
 	}
+	spin_unlock_irqrestore(&modlist_lock, flags);
 #endif
 
-	return 0;
+	return ret;
 }

arch/ppc/platforms/pmac_pic.c

@@ -21,6 +21,7 @@
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/pci.h>
+#include <linux/interrupt.h>
 
 #include <asm/sections.h>
 #include <asm/io.h>

arch/ppc/syslib/i8259.c

-#include <linux/stddef.h>
 #include <linux/init.h>
-#include <linux/irq.h>
 #include <linux/ioport.h>
-#include <linux/sched.h>
-#include <linux/signal.h>
+#include <linux/interrupt.h>
 #include <asm/io.h>
 #include <asm/i8259.h>
 

arch/ppc/syslib/open_pic.c

@@ -14,6 +14,7 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <asm/ptrace.h>
 #include <asm/signal.h>
 #include <asm/io.h>

include/asm-ppc/atomic.h

@@ -17,8 +17,10 @@ typedef struct { volatile int counter; } atomic_t;
 extern void atomic_clear_mask(unsigned long mask, unsigned long *addr);
 
 #ifdef CONFIG_SMP
+#define SMP_SYNC	"sync"
 #define SMP_ISYNC	"\n\tisync"
 #else
+#define SMP_SYNC	""
 #define SMP_ISYNC
 #endif
 
@@ -192,10 +194,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
 	return t;
 }
 
-#define smp_mb__before_atomic_dec()	smp_mb()
-#define smp_mb__after_atomic_dec()	smp_mb()
-#define smp_mb__before_atomic_inc()	smp_mb()
-#define smp_mb__after_atomic_inc()	smp_mb()
+#define __MB	__asm__ __volatile__ (SMP_SYNC : : : "memory")
+#define smp_mb__before_atomic_dec()	__MB
+#define smp_mb__after_atomic_dec()	__MB
+#define smp_mb__before_atomic_inc()	__MB
+#define smp_mb__after_atomic_inc()	__MB
 
 #endif /* __KERNEL__ */
 #endif /* _ASM_PPC_ATOMIC_H_ */

include/asm-ppc/hardirq.h

@@ -3,7 +3,7 @@
 #define __ASM_HARDIRQ_H
 
 #include <linux/config.h>
-#include <asm/smp.h>
+#include <linux/cache.h>
 
 /* The __last_jiffy_stamp field is needed to ensure that no decrementer 
  * interrupt is lost on SMP machines. Since on most CPUs it is in the same 

include/asm-ppc/module.h

 #ifndef _ASM_PPC_MODULE_H
 #define _ASM_PPC_MODULE_H
-/*
- * This file contains the PPC architecture specific module code.
- */
-
-#define module_map(x)		vmalloc(x)
-#define module_unmap(x)		vfree(x)
-#define module_arch_init(x)	(0)
-#define arch_init_modules(x)	do { } while (0)
+/* Module stuff for PPC.  (C) 2001 Rusty Russell */
+
+/* Thanks to Paul M for explaining this.
+
+   PPC can only do rel jumps += 32MB, and often the kernel and other
+   modules are furthur away than this.  So, we jump to a table of
+   trampolines attached to the module (the Procedure Linkage Table)
+   whenever that happens.
+*/
+
+struct ppc_plt_entry
+{
+	/* 16 byte jump instruction sequence (4 instructions) */
+	unsigned int jump[4];
+};
+
+struct mod_arch_specific
+{
+	/* How much of the core is actually taken up with core (then
+           we know the rest is for the PLT */
+	unsigned int core_plt_offset;
+
+	/* Same for init */
+	unsigned int init_plt_offset;
+};
+
+#define Elf_Shdr Elf32_Shdr
+#define Elf_Sym Elf32_Sym
+#define Elf_Ehdr Elf32_Ehdr
 
 #endif /* _ASM_PPC_MODULE_H */

include/asm-ppc/page.h

@@ -14,19 +14,8 @@
 #define KERNELBASE	PAGE_OFFSET
 
 #ifndef __ASSEMBLY__
-#include <asm/system.h> /* for xmon definition */
+#include <asm/processor.h>	/* for BUG definition */
 
-#ifdef CONFIG_XMON
-#define BUG() do { \
-	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-	xmon(0); \
-} while (0)
-#else
-#define BUG() do { \
-	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-	__asm__ __volatile__(".long 0x0"); \
-} while (0)
-#endif
 #define PAGE_BUG(page) do { BUG(); } while (0)
 
 #define STRICT_MM_TYPECHECKS

include/asm-ppc/processor.h

@@ -519,47 +519,6 @@
 #define	PVR_MAJ(pvr)	(((pvr) >>  4) & 0xF)	/* Major revision field */
 #define	PVR_MIN(pvr)	(((pvr) >>  0) & 0xF)	/* Minor revision field */
 
-/* Processor Version Numbers */
-
-#define	PVR_403GA	0x00200000
-#define	PVR_403GB	0x00200100
-#define	PVR_403GC	0x00200200
-#define	PVR_403GCX	0x00201400
-#define	PVR_405GP	0x40110000
-#define	PVR_STB03XXX	0x40310000
-#define	PVR_NP405H	0x41410000
-#define	PVR_NP405L	0x41610000
-#define	PVR_601		0x00010000
-#define	PVR_602		0x00050000
-#define	PVR_603		0x00030000
-#define	PVR_603e	0x00060000
-#define	PVR_603ev	0x00070000
-#define	PVR_603r	0x00071000
-#define	PVR_604		0x00040000
-#define	PVR_604e	0x00090000
-#define	PVR_604r	0x000A0000
-#define	PVR_620		0x00140000
-#define	PVR_740		0x00080000
-#define	PVR_750		PVR_740
-#define	PVR_740P	0x10080000
-#define	PVR_750P	PVR_740P
-#define	PVR_7400	0x000C0000
-#define	PVR_7410	0x800C0000
-#define	PVR_7450	0x80000000
-/*
- * For the 8xx processors, all of them report the same PVR family for
- * the PowerPC core. The various versions of these processors must be
- * differentiated by the version number in the Communication Processor
- * Module (CPM).
- */
-#define	PVR_821		0x00500000
-#define	PVR_823		PVR_821
-#define	PVR_850		PVR_821
-#define	PVR_860		PVR_821
-#define	PVR_8240	0x00810100
-#define	PVR_8245	0x80811014
-#define	PVR_8260	PVR_8240
-
 /* We only need to define a new _MACH_xxx for machines which are part of
  * a configuration which supports more than one type of different machine.
  * This is currently limited to CONFIG_ALL_PPC and CHRP/PReP/PMac. -- Tom
@@ -690,11 +649,7 @@ extern struct task_struct *last_task_used_altivec;
  * as soon as I get around to remapping the io areas with the BATs
  * to match the mac we can raise this. -- Cort
  */
-#ifdef CONFIG_TASK_SIZE_BOOL
-#define TASK_SIZE	CONFIG_TASK_SIZE
-#else
-#define TASK_SIZE	(0x80000000UL)
-#endif
+#define TASK_SIZE	(CONFIG_TASK_SIZE)
 
 /* This decides where the kernel will search for a free chunk of vm
  * space during mmap's.
@@ -788,6 +743,19 @@ extern inline void prefetchw(const void *x)
 
 #define spin_lock_prefetch(x)	prefetchw(x)
 
+#ifdef CONFIG_XMON
+extern void xmon(struct pt_regs *);
+#define BUG() do { \
+	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+	xmon(0); \
+} while (0)
+#else
+#define BUG() do { \
+	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+	__asm__ __volatile__(".long 0x0"); \
+} while (0)
+#endif
+
 #endif /* !__ASSEMBLY__ */
 
 #endif /* __ASM_PPC_PROCESSOR_H */