refresh patches

SVN-Revision: 31191

diff --git a/target/linux/generic/patches-2.6.38/020-ssb_update.patch b/target/linux/generic/patches-2.6.38/020-ssb_update.patch
index 41556285e43ed6ec4d2217c3dcf529c9d2cf7c63..8269ac3447d14a67521dd96a789fff301927d698 100644 (file)
--- a/target/linux/generic/patches-2.6.38/020-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.38/020-ssb_update.patch
@@ -403,7 +403,7 @@
        sprom_extract_r458(out, in);
  
        /* TODO - get remaining rev 8 stuff needed */
-@@ -641,7 +706,7 @@ static int sprom_extract(struct ssb_bus 
+@@ -641,7 +706,7 @@ static int sprom_extract(struct ssb_bus
                break;
        default:
                ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
@@ -412,7 +412,7 @@
                           " v1\n", out->revision);
                out->revision = 1;
                sprom_extract_r123(out, in);
-@@ -658,7 +723,6 @@ static int sprom_extract(struct ssb_bus 
+@@ -658,7 +723,6 @@ static int sprom_extract(struct ssb_bus
  static int ssb_pci_sprom_get(struct ssb_bus *bus,
                             struct ssb_sprom *sprom)
  {
@@ -1428,7 +1428,7 @@
  
  /* Suspend a SSB bus.
   * Call this from the parent bus suspend routine. */
-@@ -518,6 +538,7 @@ extern int ssb_bus_may_powerdown(struct 
+@@ -518,6 +538,7 @@ extern int ssb_bus_may_powerdown(struct
   * Otherwise static always-on powercontrol will be used. */
  extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
  

diff --git a/target/linux/generic/patches-2.6.38/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/patches-2.6.38/321-powerpc_crtsavres_prereq.patch
index df49ad017a523b25eeea094557702474ae9b7c9f..941aa909de00e3f44cdcec04d58ef1b56bf10bef 100644 (file)
--- a/target/linux/generic/patches-2.6.38/321-powerpc_crtsavres_prereq.patch
+++ b/target/linux/generic/patches-2.6.38/321-powerpc_crtsavres_prereq.patch
@@ -8,4 +8,3 @@
  
  ifeq ($(CONFIG_TUNE_CELL),y)
        KBUILD_CFLAGS += $(call cc-option,-mtune=cell)
-

diff --git a/target/linux/generic/patches-2.6.38/322-powerpc_unused_var.patch b/target/linux/generic/patches-2.6.38/322-powerpc_unused_var.patch
index bbe48d521a8fc80cb1a47a7feb3ee012048ad021..a9eed21776f0713591454f9f31779a295f42e972 100644 (file)
--- a/target/linux/generic/patches-2.6.38/322-powerpc_unused_var.patch
+++ b/target/linux/generic/patches-2.6.38/322-powerpc_unused_var.patch
@@ -1,6 +1,6 @@
 --- a/arch/powerpc/kernel/align.c
 +++ b/arch/powerpc/kernel/align.c
-@@ -701,7 +701,7 @@
+@@ -701,7 +701,7 @@ static int emulate_vsx(unsigned char __u
  
  int fix_alignment(struct pt_regs *regs)
  {
@@ -11,7 +11,7 @@
        unsigned char __user *addr;
 --- a/arch/powerpc/kernel/signal_32.c
 +++ b/arch/powerpc/kernel/signal_32.c
-@@ -935,7 +935,7 @@
+@@ -935,7 +935,7 @@ long sys_swapcontext(struct ucontext __u
                     struct ucontext __user *new_ctx,
                     int ctx_size, int r6, int r7, int r8, struct pt_regs *regs)
  {
@@ -20,7 +20,7 @@
        int ctx_has_vsx_region = 0;
  
  #ifdef CONFIG_PPC64
-@@ -1076,7 +1076,7 @@
+@@ -1076,7 +1076,7 @@ int sys_debug_setcontext(struct ucontext
  {
        struct sig_dbg_op op;
        int i;
@@ -31,7 +31,7 @@
        unsigned long new_dbcr0 = current->thread.dbcr0;
 --- a/arch/powerpc/mm/mem.c
 +++ b/arch/powerpc/mm/mem.c
-@@ -171,7 +171,7 @@
+@@ -171,7 +171,7 @@ void __init do_init_bootmem(void)
        unsigned long start, bootmap_pages;
        unsigned long total_pages;
        struct memblock_region *reg;
@@ -42,7 +42,7 @@
        total_pages = (memblock_end_of_DRAM() - memstart_addr) >> PAGE_SHIFT;
 --- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
 +++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
-@@ -327,7 +327,7 @@
+@@ -327,7 +327,7 @@ void __init qe_ic_init(struct device_nod
  {
        struct qe_ic *qe_ic;
        struct resource res;
@@ -51,7 +51,7 @@
  
        ret = of_address_to_resource(node, 0, &res);
        if (ret)
-@@ -376,7 +376,6 @@
+@@ -376,7 +376,6 @@ void __init qe_ic_init(struct device_nod
        /* choose destination signal for highest priority interrupt */
        if (flags & QE_IC_HIGH_SIGNAL) {
                temp |= (SIGNAL_HIGH << CICR_HPIT_SHIFT);

diff --git a/target/linux/generic/patches-2.6.38/622-sched_sfq_fix_enqueue.patch b/target/linux/generic/patches-2.6.38/622-sched_sfq_fix_enqueue.patch
index 122f62b9e6488ff32e9400c157d0d2e2cc9c9b88..b849106873b4f9d4294dd708ec26d020bbc68876 100644 (file)
--- a/target/linux/generic/patches-2.6.38/622-sched_sfq_fix_enqueue.patch
+++ b/target/linux/generic/patches-2.6.38/622-sched_sfq_fix_enqueue.patch
@@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/net/sched/sch_sfq.c
 +++ b/net/sched/sch_sfq.c
-@@ -410,7 +410,12 @@ sfq_enqueue(struct sk_buff *skb, struct 
+@@ -410,7 +410,12 @@ sfq_enqueue(struct sk_buff *skb, struct
        /* Return Congestion Notification only if we dropped a packet
         * from this flow.
         */