[kernel/2.6.38] refresh patches

[openwrt.git] / target / linux / generic / patches-2.6.38 / 322-powerpc_unused_var.patch

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 bbe48d5..a9eed21 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);