Messages in this thread Patch in this message | | | Date | Mon, 7 May 2007 15:43:33 -0700 | From | Venki Pallipadi <> | Subject | Re: [PATCH] x86-64 highres/dyntick support |
| |
Needs this minor fix to build on i386.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Index: linux-2.6.21-tolkml/include/asm-i386/hpet.h =================================================================== --- linux-2.6.21-tolkml.orig/include/asm-i386/hpet.h 2007-05-07 14:32:37.000000000 -0700 +++ linux-2.6.21-tolkml/include/asm-i386/hpet.h 2007-05-07 14:43:54.000000000 -0700 @@ -71,17 +71,6 @@ #ifdef CONFIG_X86_64 /* hpet_readl/writel defines */ #include <asm/vsyscall.h> - -#else -static inline unsigned long hpet_readl(unsigned long a) -{ - return readl(hpet_virt_address + a); -} - -static inline void hpet_writel(unsigned long d, unsigned long a) -{ - writel(d, hpet_virt_address + a); -} #endif #ifdef CONFIG_HPET_EMULATE_RTC Index: linux-2.6.21-tolkml/arch/i386/kernel/hpet.c =================================================================== --- linux-2.6.21-tolkml.orig/arch/i386/kernel/hpet.c 2007-05-07 14:31:34.000000000 -0700 +++ linux-2.6.21-tolkml/arch/i386/kernel/hpet.c 2007-05-07 14:43:36.000000000 -0700 @@ -47,6 +47,16 @@ static void __iomem * hpet_virt_address; +static inline unsigned long hpet_readl(unsigned long a) +{ + return readl(hpet_virt_address + a); +} + +static inline void hpet_writel(unsigned long d, unsigned long a) +{ + writel(d, hpet_virt_address + a); +} + static inline void hpet_set_mapping(void) { hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |