kernel: fix powerpc unused-but-set variables
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-2.6.38 / 322-powerpc_unused_var.patch
1 --- a/arch/powerpc/kernel/align.c
2 +++ b/arch/powerpc/kernel/align.c
3 @@ -701,7 +701,7 @@
4
5 int fix_alignment(struct pt_regs *regs)
6 {
7 - unsigned int instr, nb, flags, instruction = 0;
8 + unsigned int instr, nb, flags, instruction __maybe_unused = 0;
9 unsigned int reg, areg;
10 unsigned int dsisr;
11 unsigned char __user *addr;
12 --- a/arch/powerpc/kernel/signal_32.c
13 +++ b/arch/powerpc/kernel/signal_32.c
14 @@ -935,7 +935,7 @@
15 struct ucontext __user *new_ctx,
16 int ctx_size, int r6, int r7, int r8, struct pt_regs *regs)
17 {
18 - unsigned char tmp;
19 + unsigned char tmp __maybe_unused;
20 int ctx_has_vsx_region = 0;
21
22 #ifdef CONFIG_PPC64
23 @@ -1076,7 +1076,7 @@
24 {
25 struct sig_dbg_op op;
26 int i;
27 - unsigned char tmp;
28 + unsigned char tmp __maybe_unused;
29 unsigned long new_msr = regs->msr;
30 #ifdef CONFIG_PPC_ADV_DEBUG_REGS
31 unsigned long new_dbcr0 = current->thread.dbcr0;
32 --- a/arch/powerpc/mm/mem.c
33 +++ b/arch/powerpc/mm/mem.c
34 @@ -171,7 +171,7 @@
35 unsigned long start, bootmap_pages;
36 unsigned long total_pages;
37 struct memblock_region *reg;
38 - int boot_mapsize;
39 + int boot_mapsize __maybe_unused;
40
41 max_low_pfn = max_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT;
42 total_pages = (memblock_end_of_DRAM() - memstart_addr) >> PAGE_SHIFT;
43 --- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
44 +++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
45 @@ -327,7 +327,7 @@
46 {
47 struct qe_ic *qe_ic;
48 struct resource res;
49 - u32 temp = 0, ret, high_active = 0;
50 + u32 temp = 0, ret;
51
52 ret = of_address_to_resource(node, 0, &res);
53 if (ret)
54 @@ -376,7 +376,6 @@
55 /* choose destination signal for highest priority interrupt */
56 if (flags & QE_IC_HIGH_SIGNAL) {
57 temp |= (SIGNAL_HIGH << CICR_HPIT_SHIFT);
58 - high_active = 1;
59 }
60
61 qe_ic_write(qe_ic->regs, QEIC_CICR, temp);