[ar7] resync kernel configuration

[openwrt.git] / target / linux / generic-2.4 / patches / 206-gcc_3.4_fixes.patch

diff --git a/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch b/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch
index 9cf0553..bdf6501 100644 (file)
--- a/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch
+++ b/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch
@@ -1,6 +1,5 @@
-diff -Nur linux-2.4.30/arch/mips/kernel/signal.c linux-2.4.30.openwrt/arch/mips/kernel/signal.c
---- linux-2.4.30/arch/mips/kernel/signal.c     2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/arch/mips/kernel/signal.c     2005-07-02 13:00:49.000000000 +0200
+--- a/arch/mips/kernel/signal.c
++++ b/arch/mips/kernel/signal.c
 @@ -6,8 +6,10 @@
   * Copyright (C) 1991, 1992  Linus Torvalds
   * Copyright (C) 1994 - 1999  Ralf Baechle
@@ -12,7 +11,7 @@ diff -Nur linux-2.4.30/arch/mips/kernel/signal.c linux-2.4.30.openwrt/arch/mips/
  #include <linux/sched.h>
  #include <linux/mm.h>
  #include <linux/smp.h>
-@@ -76,7 +78,9 @@
+@@ -76,7 +78,9 @@ int copy_siginfo_to_user(siginfo_t *to, 
   * Atomically swap in the new signal mask, and wait for a signal.
   */
  save_static_function(sys_sigsuspend);
@@ -23,7 +22,7 @@ diff -Nur linux-2.4.30/arch/mips/kernel/signal.c linux-2.4.30.openwrt/arch/mips/
  {
        sigset_t *uset, saveset, newset;
  
-@@ -102,7 +106,9 @@
+@@ -102,7 +106,9 @@ static_unused int _sys_sigsuspend(struct
  }
  
  save_static_function(sys_rt_sigsuspend);
@@ -34,9 +33,8 @@ diff -Nur linux-2.4.30/arch/mips/kernel/signal.c linux-2.4.30.openwrt/arch/mips/
  {
        sigset_t *unewset, saveset, newset;
          size_t sigsetsize;
-diff -Nur linux-2.4.30/arch/mips/kernel/syscall.c linux-2.4.30.openwrt/arch/mips/kernel/syscall.c
---- linux-2.4.30/arch/mips/kernel/syscall.c    2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/arch/mips/kernel/syscall.c    2005-07-02 13:00:49.000000000 +0200
+--- a/arch/mips/kernel/syscall.c
++++ b/arch/mips/kernel/syscall.c
 @@ -5,6 +5,7 @@
   *
   * Copyright (C) 1995 - 2000 by Ralf Baechle
@@ -45,7 +43,7 @@ diff -Nur linux-2.4.30/arch/mips/kernel/syscall.c linux-2.4.30.openwrt/arch/mips
   *
   * TODO:  Implement the compatibility syscalls.
   *        Don't waste that much memory for empty entries in the syscall
-@@ -158,7 +159,9 @@
+@@ -158,7 +159,9 @@ sys_mmap2(unsigned long addr, unsigned l
  }
  
  save_static_function(sys_fork);
@@ -56,7 +54,7 @@ diff -Nur linux-2.4.30/arch/mips/kernel/syscall.c linux-2.4.30.openwrt/arch/mips
  {
        int res;
  
-@@ -168,7 +171,9 @@
+@@ -168,7 +171,9 @@ static_unused int _sys_fork(struct pt_re
  
  
  save_static_function(sys_clone);
@@ -67,10 +65,9 @@ diff -Nur linux-2.4.30/arch/mips/kernel/syscall.c linux-2.4.30.openwrt/arch/mips
  {
        unsigned long clone_flags;
        unsigned long newsp;
-diff -Nur linux-2.4.30/arch/mips/ld.script.in linux-2.4.30.openwrt/arch/mips/ld.script.in
---- linux-2.4.30/arch/mips/ld.script.in        2005-07-02 13:00:22.000000000 +0200
-+++ linux-2.4.30.openwrt/arch/mips/ld.script.in        2005-07-02 13:00:42.000000000 +0200
-@@ -9,6 +9,7 @@
+--- a/arch/mips/ld.script.in
++++ b/arch/mips/ld.script.in
+@@ -9,6 +9,7 @@ SECTIONS
    {
      _ftext = . ;
      *(.text)
@@ -78,9 +75,8 @@ diff -Nur linux-2.4.30/arch/mips/ld.script.in linux-2.4.30.openwrt/arch/mips/ld.
      *(.rodata)
      *(.rodata.*)
      *(.rodata1)
-diff -Nur linux-2.4.30/arch/mips64/kernel/signal.c linux-2.4.30.openwrt/arch/mips64/kernel/signal.c
---- linux-2.4.30/arch/mips64/kernel/signal.c   2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/arch/mips64/kernel/signal.c   2005-07-02 13:00:49.000000000 +0200
+--- a/arch/mips64/kernel/signal.c
++++ b/arch/mips64/kernel/signal.c
 @@ -6,8 +6,10 @@
   * Copyright (C) 1991, 1992  Linus Torvalds
   * Copyright (C) 1994 - 2000  Ralf Baechle
@@ -92,7 +88,7 @@ diff -Nur linux-2.4.30/arch/mips64/kernel/signal.c linux-2.4.30.openwrt/arch/mip
  #include <linux/sched.h>
  #include <linux/mm.h>
  #include <linux/smp.h>
-@@ -75,7 +77,9 @@
+@@ -75,7 +77,9 @@ int copy_siginfo_to_user(siginfo_t *to, 
   * Atomically swap in the new signal mask, and wait for a signal.
   */
  save_static_function(sys_rt_sigsuspend);
@@ -103,9 +99,8 @@ diff -Nur linux-2.4.30/arch/mips64/kernel/signal.c linux-2.4.30.openwrt/arch/mip
  {
        sigset_t *unewset, saveset, newset;
          size_t sigsetsize;
-diff -Nur linux-2.4.30/arch/mips64/kernel/signal32.c linux-2.4.30.openwrt/arch/mips64/kernel/signal32.c
---- linux-2.4.30/arch/mips64/kernel/signal32.c 2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/arch/mips64/kernel/signal32.c 2005-07-02 13:00:49.000000000 +0200
+--- a/arch/mips64/kernel/signal32.c
++++ b/arch/mips64/kernel/signal32.c
 @@ -6,7 +6,9 @@
   * Copyright (C) 1991, 1992  Linus Torvalds
   * Copyright (C) 1994 - 2000  Ralf Baechle
@@ -116,7 +111,7 @@ diff -Nur linux-2.4.30/arch/mips64/kernel/signal32.c linux-2.4.30.openwrt/arch/m
  #include <linux/sched.h>
  #include <linux/mm.h>
  #include <linux/smp.h>
-@@ -192,7 +194,9 @@
+@@ -192,7 +194,9 @@ static inline int get_sigset(sigset_t *k
   * Atomically swap in the new signal mask, and wait for a signal.
   */
  save_static_function(sys32_sigsuspend);
@@ -127,7 +122,7 @@ diff -Nur linux-2.4.30/arch/mips64/kernel/signal32.c linux-2.4.30.openwrt/arch/m
  {
        sigset32_t *uset;
        sigset_t newset, saveset;
-@@ -219,7 +223,9 @@
+@@ -219,7 +223,9 @@ static_unused int _sys32_sigsuspend(abi6
  }
  
  save_static_function(sys32_rt_sigsuspend);
@@ -138,9 +133,8 @@ diff -Nur linux-2.4.30/arch/mips64/kernel/signal32.c linux-2.4.30.openwrt/arch/m
  {
        sigset32_t *uset;
        sigset_t newset, saveset;
-diff -Nur linux-2.4.30/arch/mips64/kernel/syscall.c linux-2.4.30.openwrt/arch/mips64/kernel/syscall.c
---- linux-2.4.30/arch/mips64/kernel/syscall.c  2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/arch/mips64/kernel/syscall.c  2005-07-02 13:00:49.000000000 +0200
+--- a/arch/mips64/kernel/syscall.c
++++ b/arch/mips64/kernel/syscall.c
 @@ -6,7 +6,9 @@
   * Copyright (C) 1995 - 2000, 2001 by Ralf Baechle
   * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
@@ -151,7 +145,7 @@ diff -Nur linux-2.4.30/arch/mips64/kernel/syscall.c linux-2.4.30.openwrt/arch/mi
  #include <linux/errno.h>
  #include <linux/linkage.h>
  #include <linux/mm.h>
-@@ -151,7 +153,9 @@
+@@ -151,7 +153,9 @@ out:
  }
  
  save_static_function(sys_fork);
@@ -162,7 +156,7 @@ diff -Nur linux-2.4.30/arch/mips64/kernel/syscall.c linux-2.4.30.openwrt/arch/mi
  {
        int res;
  
-@@ -160,7 +164,9 @@
+@@ -160,7 +164,9 @@ static_unused int _sys_fork(abi64_no_reg
  }
  
  save_static_function(sys_clone);
@@ -173,9 +167,8 @@ diff -Nur linux-2.4.30/arch/mips64/kernel/syscall.c linux-2.4.30.openwrt/arch/mi
  {
        unsigned long clone_flags;
        unsigned long newsp;
-diff -Nur linux-2.4.30/include/asm-mips/ptrace.h linux-2.4.30.openwrt/include/asm-mips/ptrace.h
---- linux-2.4.30/include/asm-mips/ptrace.h     2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/include/asm-mips/ptrace.h     2005-07-02 13:00:49.000000000 +0200
+--- a/include/asm-mips/ptrace.h
++++ b/include/asm-mips/ptrace.h
 @@ -4,6 +4,7 @@
   * for more details.
   *
@@ -184,7 +177,7 @@ diff -Nur linux-2.4.30/include/asm-mips/ptrace.h linux-2.4.30.openwrt/include/as
   *
   * Machine dependent structs and defines to help the user use
   * the ptrace system call.
-@@ -64,12 +65,10 @@
+@@ -64,12 +65,10 @@ __asm__ (                               
          "sw\t$22,"__str(PT_R22)"($29)\n\t"                              \
          "sw\t$23,"__str(PT_R23)"($29)\n\t"                              \
          "sw\t$30,"__str(PT_R30)"($29)\n\t"                              \
@@ -198,9 +191,8 @@ diff -Nur linux-2.4.30/include/asm-mips/ptrace.h linux-2.4.30.openwrt/include/as
  #endif /* !__ASSEMBLY__ */
  
  /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-diff -Nur linux-2.4.30/include/asm-mips64/ptrace.h linux-2.4.30.openwrt/include/asm-mips64/ptrace.h
---- linux-2.4.30/include/asm-mips64/ptrace.h   2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/include/asm-mips64/ptrace.h   2005-07-02 13:00:49.000000000 +0200
+--- a/include/asm-mips64/ptrace.h
++++ b/include/asm-mips64/ptrace.h
 @@ -5,6 +5,7 @@
   *
   * Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle
@@ -209,7 +201,7 @@ diff -Nur linux-2.4.30/include/asm-mips64/ptrace.h linux-2.4.30.openwrt/include/
   */
  #ifndef _ASM_PTRACE_H
  #define _ASM_PTRACE_H
-@@ -61,12 +62,10 @@
+@@ -61,12 +62,10 @@ __asm__ (                               
          "sd\t$22,"__str(PT_R22)"($29)\n\t"                              \
          "sd\t$23,"__str(PT_R23)"($29)\n\t"                              \
          "sd\t$30,"__str(PT_R30)"($29)\n\t"                              \