add back marvell switch support to 2.6.28

[openwrt.git] / target / linux / atheros / patches-2.6.26 / 901-get_c0_compare_irq_function.patch

diff --git a/target/linux/atheros/patches-2.6.26/901-get_c0_compare_irq_function.patch b/target/linux/atheros/patches-2.6.26/901-get_c0_compare_irq_function.patch
index 4d25b1f..46640ba 100644 (file)
--- a/target/linux/atheros/patches-2.6.26/901-get_c0_compare_irq_function.patch
+++ b/target/linux/atheros/patches-2.6.26/901-get_c0_compare_irq_function.patch
@@ -8,7 +8,7 @@
  
  extern asmlinkage void handle_int(void);
  extern asmlinkage void handle_tlbm(void);
  
  extern asmlinkage void handle_int(void);
  extern asmlinkage void handle_tlbm(void);

-@@ -1464,6 +1465,8 @@
+@@ -1464,6 +1465,8 @@ void __cpuinit per_cpu_trap_init(void)

         */
        if (cpu_has_mips_r2) {
                cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
         */
        if (cpu_has_mips_r2) {
                cp0_compare_irq = (read_c0_intctl() >> 29) & 7;


@@ -19,7 +19,7 @@
                        cp0_perfcount_irq = -1;
 --- a/include/asm-mips/time.h
 +++ b/include/asm-mips/time.h
                        cp0_perfcount_irq = -1;
 --- a/include/asm-mips/time.h
 +++ b/include/asm-mips/time.h

-@@ -53,6 +53,7 @@
+@@ -53,6 +53,7 @@ extern int (*perf_irq)(void);

  #ifdef CONFIG_CEVT_R4K
  extern int mips_clockevent_init(void);
  extern unsigned int __weak get_c0_compare_int(void);
  #ifdef CONFIG_CEVT_R4K
  extern int mips_clockevent_init(void);
  extern unsigned int __weak get_c0_compare_int(void);


@@ -29,12 +29,12 @@
  {
 --- a/arch/mips/atheros/board.c
 +++ b/arch/mips/atheros/board.c
  {
 --- a/arch/mips/atheros/board.c
 +++ b/arch/mips/atheros/board.c

-@@ -205,6 +205,11 @@
+@@ -265,6 +265,11 @@ void (*board_time_init)(void);

  void __init plat_time_init(void) {
      board_time_init();
  }
 +
  void __init plat_time_init(void) {
      board_time_init();
  }
 +

-+unsigned int __init get_c0_compare_irq(void)
++unsigned int __cpuinit get_c0_compare_irq(void)

 +{
 +      return CP0_LEGACY_COMPARE_IRQ;
 +}
 +{
 +      return CP0_LEGACY_COMPARE_IRQ;
 +}