Re: [PATCH] KJ: Make i8259_64 more _32-like

[Andrew Morton <akpm@linux-foundation.org>]

On Tue, 30 Oct 2007 10:29:57 -0500 Paul Jimenez <pj@place.org> wrote:

>  This patch mainly hinges around two includes and their ramifications:
>  
>  #include <i8259.h>	which provides cached_{slave,master}_mask
>  #include <io_ports.h>	which provides PIC_{MASTER,SLAVE}_{IMR,CMD} 
>  
>  Adding these two includes and using those half dozen or so definitions
>  removed 140+ lines of diffs between i8259_32.c and i8259_64.c, thus
>  making it easier for the real substantitive differences between them to
>  show up, and hopefully therefore making it easier to eventually merge
>  the two.  All the warnings that checkpatch.pl throws (missing spaces
>  after commas and >80 character lines) exist intentionally to match
>  i8259_32.c.

x86_64 allnoconfig:

arch/x86/kernel/i8259_64.c:26:22: error: io_ports.h: No such file or directory
arch/x86/kernel/i8259_64.c:120: error: static declaration of 'cached_irq_mask' follows non-static declaration
include/asm/i8259.h:4: error: previous declaration of 'cached_irq_mask' was here
arch/x86/kernel/i8259_64.c: In function 'disable_8259A_irq':
arch/x86/kernel/i8259_64.c:141: error: 'PIC_SLAVE_IMR' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:141: error: (Each undeclared identifier is reported only once
arch/x86/kernel/i8259_64.c:141: error: for each function it appears in.)
arch/x86/kernel/i8259_64.c:143: error: 'PIC_MASTER_IMR' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c: In function 'enable_8259A_irq':
arch/x86/kernel/i8259_64.c:155: error: 'PIC_SLAVE_IMR' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:157: error: 'PIC_MASTER_IMR' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c: In function 'i8259A_irq_pending':
arch/x86/kernel/i8259_64.c:169: error: 'PIC_MASTER_CMD' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:171: error: 'PIC_SLAVE_CMD' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c: In function 'i8259A_irq_real':
arch/x86/kernel/i8259_64.c:198: error: 'PIC_MASTER_CMD' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:203: error: 'PIC_SLAVE_CMD' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c: In function 'mask_and_ack_8259A':
arch/x86/kernel/i8259_64.c:242: error: 'PIC_SLAVE_IMR' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:244: error: 'PIC_SLAVE_CMD' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:245: error: 'PIC_CASCADE_IR' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:245: error: 'PIC_MASTER_CMD' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:247: error: 'PIC_MASTER_IMR' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c: In function 'i8259A_shutdown':
arch/x86/kernel/i8259_64.c:321: error: 'PIC_MASTER_IMR' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:322: error: 'PIC_SLAVE_IMR' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c: In function 'init_8259A':
arch/x86/kernel/i8259_64.c:356: error: 'PIC_MASTER_IMR' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:357: error: 'PIC_SLAVE_IMR' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:362: error: 'PIC_MASTER_CMD' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:366: error: 'MASTER_ICW4_DEFAULT' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:366: error: 'PIC_ICW4_AEOI' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:370: error: 'PIC_SLAVE_CMD' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:372: error: 'PIC_CASCADE_IR' undeclared (first use in this function)
arch/x86/kernel/i8259_64.c:373: error: 'SLAVE_ICW4_DEFAULT' undeclared (first use in this function)