Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (78 commits)
  [PARISC] Use symbolic last syscall in __NR_Linux_syscalls
  [PARISC] Add missing statfs64 and fstatfs64 syscalls
  Revert "[PARISC] Optimize TLB flush on SMP systems"
  [PARISC] Compat signal fixes for 64-bit parisc
  [PARISC] Reorder syscalls to match unistd.h
  Revert "[PATCH] make kernel/signal.c:kill_proc_info() static"
  [PARISC] fix sys_rt_sigqueueinfo
  [PARISC] fix section mismatch warnings in harmony sound driver
  [PARISC] do not export get_register/set_register
  [PARISC] add ENTRY()/ENDPROC() and simplify assembly of HP/UX emulation code
  [PARISC] convert to use CONFIG_64BIT instead of __LP64__
  [PARISC] use CONFIG_64BIT instead of __LP64__
  [PARISC] add ASM_EXCEPTIONTABLE_ENTRY() macro
  [PARISC] more ENTRY(), ENDPROC(), END() conversions
  [PARISC] fix ENTRY() and ENDPROC() for 64bit-parisc
  [PARISC] Fixes /proc/cpuinfo cache output on B160L
  [PARISC] implement standard ENTRY(), END() and ENDPROC()
  [PARISC] kill ENTRY_SYS_CPUS
  [PARISC] clean up debugging printks in smp.c
  [PARISC] factor syscall_restart code out of do_signal
  ...

Fix conflict in include/linux/sched.h due to kill_proc_info() being made
publicly available to PARISC again.

2 files changed, 24 insertions, 1 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index f61c9ccef6aa..b2f73ffb40bd 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -452,6 +452,24 @@ static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa,
         return 1;
 }
 
+/* Looks like: parisc:tNhvNrevNsvN */
+static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
+                char *alias)
+{
+        id->hw_type = TO_NATIVE(id->hw_type);
+        id->hversion = TO_NATIVE(id->hversion);
+        id->hversion_rev = TO_NATIVE(id->hversion_rev);
+        id->sversion = TO_NATIVE(id->sversion);
+
+        strcpy(alias, "parisc:");
+        ADD(alias, "t", id->hw_type != PA_HWTYPE_ANY_ID, id->hw_type);
+        ADD(alias, "hv", id->hversion != PA_HVERSION_ANY_ID, id->hversion);
+        ADD(alias, "rev", id->hversion_rev != PA_HVERSION_REV_ANY_ID, id->hversion_rev);
+        ADD(alias, "sv", id->sversion != PA_SVERSION_ANY_ID, id->sversion);
+
+        return 1;
+}
+
 /* Ignore any prefix, eg. v850 prepends _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -559,6 +577,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct eisa_device_id), "eisa",
                          do_eisa_entry, mod);
+        else if (sym_is(symname, "__mod_parisc_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct parisc_device_id), "parisc",
+                         do_parisc_entry, mod);
 }
 
 /* Now add out buffered information to the generated C source */
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index c4b5398687b8..65bdfdb56877 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -961,7 +961,7 @@ static int init_section_ref_ok(const char *name)
                 ".opd",   /* see comment [OPD] at exit_section_ref_ok() */
                 ".toc1",  /* used by ppc64 */
                 ".stab",
-                ".rodata",
+                ".data.rel.ro", /* used by parisc64 */
                 ".parainstructions",
                 ".text.lock",
                 "__bug_table", /* used by powerpc for BUG() */
@@ -984,6 +984,7 @@ static int init_section_ref_ok(const char *name)
                 ".eh_frame",
                 ".debug",
                 ".parainstructions",
+                ".rodata",
                 NULL
         };
         /* part of section name */