GIT 5e1a364d7d13166f954997b5390ae73250c04296 git+ssh://master.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch commit Author: Cyrill Gorcunov Date: Sun Feb 3 14:22:18 2008 +0300 AVR32: cleanup - use _AC macro to define PAGE_SIZE PAGE_SIZE is used both from assembly and C code. We want to have type specifiers when using it from C, but this will make the assembler confused, so we need to make it conditional. This is exactly what the _AC macro is for, so using it allows us to get rid of a few lines of cpp noise. Signed-off-by: Cyrill Gorcunov Signed-off-by: Haavard Skinnemoen commit effca4e7b6d3527ff36331f9d3c17a0332e88a3e Author: Hans-Christian Egtvedt Date: Tue Dec 4 13:15:41 2007 +0100 Generate raw keyboard codes for AVR32 architecture This patchs adds the AVR32 architecture to the list of archs to generate a table of raw keyboard keycodes. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Haavard Skinnemoen drivers/char/keyboard.c | 3 ++- include/asm-avr32/page.h | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index fc54d23..87aeebe 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c @@ -1034,7 +1034,8 @@ DECLARE_TASKLET_DISABLED(keyboard_tasklet, kbd_bh, 0); #if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\ defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) ||\ defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\ - (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC)) + (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC)) ||\ + defined(CONFIG_AVR32) #define HW_RAW(dev) (test_bit(EV_MSC, dev->evbit) && test_bit(MSC_RAW, dev->mscbit) &&\ ((dev)->id.bustype == BUS_I8042) && ((dev)->id.vendor == 0x0001) && ((dev)->id.product == 0x0001)) diff --git a/include/asm-avr32/page.h b/include/asm-avr32/page.h index 0f630b3..bcf4194 100644 --- a/include/asm-avr32/page.h +++ b/include/asm-avr32/page.h @@ -10,13 +10,11 @@ #ifdef __KERNEL__ +#include + /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 -#ifdef __ASSEMBLY__ -#define PAGE_SIZE (1 << PAGE_SHIFT) -#else -#define PAGE_SIZE (1UL << PAGE_SHIFT) -#endif +#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) #define PTE_MASK PAGE_MASK