[GIT PULL] sh fixes

[GIT PULL] sh fixes

[Paul Mundt]

Please pull from:

	master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git

Which contains:

Kristoffer Ericson (1):
      sh: Trivial fix for hp6xx build.

Paul Mundt (2):
      sh: Kill bogus GCC4 symbol exports.
      sh: Fixup __cmpxchg() compile breakage with gcc4.

 arch/sh/kernel/sh_ksyms.c |    3 ---
 include/asm-sh/hp6xx.h    |    6 +++---
 include/asm-sh/system.h   |    1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c
index fe1b276..6e0d10f 100644
--- a/arch/sh/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms.c
@@ -82,9 +82,6 @@ DECLARE_EXPORT(__movstr);
 DECLARE_EXPORT(__movmem_i4_even);
 DECLARE_EXPORT(__movmem_i4_odd);
 DECLARE_EXPORT(__movmemSI12_i4);
-DECLARE_EXPORT(__sdivsi3_i4i);
-DECLARE_EXPORT(__udiv_qrnnd_16);
-DECLARE_EXPORT(__udivsi3_i4i);
 #else /* GCC 3.x */
 DECLARE_EXPORT(__movstr_i4_even);
 DECLARE_EXPORT(__movstr_i4_odd);
diff --git a/include/asm-sh/hp6xx.h b/include/asm-sh/hp6xx.h
index f35134c..53ca564 100644
--- a/include/asm-sh/hp6xx.h
+++ b/include/asm-sh/hp6xx.h
@@ -10,9 +10,9 @@
  *
  */
 
-#define HP680_BTN_IRQ		IRQ0_IRQ
-#define HP680_TS_IRQ		IRQ3_IRQ
-#define HP680_HD64461_IRQ	IRQ4_IRQ
+#define HP680_BTN_IRQ		32            /* IRQ0_IRQ */
+#define HP680_TS_IRQ		35            /* IRQ3_IRQ */
+#define HP680_HD64461_IRQ	36            /* IRQ4_IRQ */
 
 #define DAC_LCD_BRIGHTNESS	0
 #define DAC_SPEAKER_VOLUME	1
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index b1e42e7..4a6a19f 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -7,6 +7,7 @@
  */
 
 #include <linux/irqflags.h>
+#include <linux/compiler.h>
 #include <asm/types.h>
 
 /*

[GIT PULL] sh fixes

[Paul Mundt]

There were some collisions with Andrew's last couple rounds of patches,
so this is a second set of updates that includes fixes for all of those
things, and gets us back to a working state.

Please pull from:

	master.kernel.org::/pub/scm/linux/kernel/git/lethal/sh-2.6.git

Which contains:

Manuel Lauss (1):
      sh: SH7760 DMABRG support.

Paul Mundt (15):
      sh: generic quicklist support.
      rtc: rtc-sh: Fix up dev_dbg() warnings.
      sh: __GFP_REPEAT for pte allocations, too.
      sh: Always define TRAPA_BUG_OPCODE.
      sh: Share exception vector table for SH-3/4.
      sh: Kill off redundant __div64_32 symbol export.
      sh: Support for SH-2A 32-bit opcodes.
      sh: Fix PC adjustments for varying opcode length.
      sh: Add 32-bit opcode feature CPU flag.
      sh: Wire up utimensat syscall.
      sh: Convert to common die chain.
      rtc: rtc-sh: Fix rtc_dev pointer for rtc_update_irq().
      sh: Truncate MAX_ACTIVE_REGIONS for the common case.
      sh: clockevent/clocksource/hrtimers/nohz TMU support.
      sh: Fix stacktrace simplification fallout.

kogiidena (2):
      sh: Fixup ndelay() xloops calculation for alternate HZ.
      sh: landisk mv_nr_irqs definition.

 arch/sh/Kconfig                         |   29 +---
 arch/sh/boards/landisk/setup.c          |    1 
 arch/sh/drivers/Makefile                |    3 
 arch/sh/drivers/dma/Kconfig             |   20 ++-
 arch/sh/drivers/dma/Makefile            |    4 
 arch/sh/drivers/dma/dmabrg.c            |  196 ++++++++++++++++++++++++++++++++
 arch/sh/kernel/cpu/sh2a/Makefile        |    5 
 arch/sh/kernel/cpu/sh2a/opcode_helper.c |   55 ++++++++
 arch/sh/kernel/cpu/sh2a/probe.c         |    1 
 arch/sh/kernel/cpu/sh3/ex.S             |   13 +-
 arch/sh/kernel/cpu/sh4/Makefile         |    6 
 arch/sh/kernel/cpu/sh4/ex.S             |   62 ----------
 arch/sh/kernel/cpu/sh4/fpu.c            |    3 
 arch/sh/kernel/process.c                |   16 +-
 arch/sh/kernel/setup.c                  |    2 
 arch/sh/kernel/sh_ksyms.c               |    2 
 arch/sh/kernel/signal.c                 |   13 +-
 arch/sh/kernel/stacktrace.c             |    2 
 arch/sh/kernel/syscalls.S               |    1 
 arch/sh/kernel/time.c                   |  172 ++++++++--------------------
 arch/sh/kernel/timers/timer-tmu.c       |  182 +++++++++++++++++------------
 arch/sh/kernel/traps.c                  |   20 ---
 arch/sh/lib/delay.c                     |    5 
 arch/sh/mm/Kconfig                      |    7 +
 arch/sh/mm/fault.c                      |    2 
 arch/sh/mm/init.c                       |    2 
 drivers/rtc/rtc-sh.c                    |    8 -
 include/asm-sh/bug.h                    |    4 
 include/asm-sh/cpu-features.h           |    1 
 include/asm-sh/dmabrg.h                 |   23 +++
 include/asm-sh/kdebug.h                 |   25 ----
 include/asm-sh/pgalloc.h                |   44 ++++---
 include/asm-sh/system.h                 |    9 +
 include/asm-sh/timer.h                  |   25 ----
 include/asm-sh/unistd.h                 |    5 
 mm/Kconfig                              |    2 
 36 files changed, 572 insertions(+), 398 deletions(-)

[GIT PULL] sh fixes

[Paul Mundt]

Please pull from:

	master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git

Which contains:

Kaz Kojima (1):
      sh: Fix restartable syscall arg5 clobbering.

Paul Mundt (2):
      sh: oops_enter()/oops_exit() in die().
      sh: Handle -ERESTART_RESTARTBLOCK for restartable syscalls.

 arch/sh/kernel/signal.c |    9 ++++++---
 arch/sh/kernel/traps.c  |    3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)