Merge

arch/sparc64/kernel/pci.c

@@ -7,6 +7,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/sched.h>
@@ -799,6 +800,7 @@ int pci_domain_nr(struct pci_bus *pbus)
 
 	return ret;
 }
+EXPORT_SYMBOL(pci_domain_nr);
 
 int pci_name_bus(char *name, struct pci_bus *bus)
 {

arch/sparc64/kernel/unaligned.c

@@ -175,7 +175,7 @@ static unsigned long compute_effective_address(struct pt_regs *regs,
 }
 
 /* This is just to make gcc think die_if_kernel does return... */
-static void unaligned_panic(char *str, struct pt_regs *regs)
+static void __attribute_used__ unaligned_panic(char *str, struct pt_regs *regs)
 {
 	die_if_kernel(str, regs);
 }

scripts/modpost.c

@@ -267,6 +267,7 @@ parse_elf(struct elf_info *info, const char *filename)
 	hdr->e_shoff    = TO_NATIVE(hdr->e_shoff);
 	hdr->e_shstrndx = TO_NATIVE(hdr->e_shstrndx);
 	hdr->e_shnum    = TO_NATIVE(hdr->e_shnum);
+	hdr->e_machine  = TO_NATIVE(hdr->e_machine);
 	sechdrs = (void *)hdr + hdr->e_shoff;
 	info->sechdrs = sechdrs;