Fix for 2.4.10's broken char/joystick/analog.c
PATCH 1/1 Fix for 2.4.10's broken char/joystick/analog.c
Hi!
My x86_64 fixes broke my own analog.c in 2.4.10 on machines with TSC. Here is a patch that adds the missing braces. With this patch it is verified to work fine. My apologies.
drivers/char/joystick/analog.c +1 -1
@@ -138,7 +138,7 @@#ifdef __i386__#define TSC_PRESENT (test_bit(X86_FEATURE_TSC, &boot_cpu_data.x86_capability)) -#define GET_TIME (x) do { if (TSC_PRESENT) rdtscl(x); else outb(0, 0x43); x = inb(0x40); x |= inb(0x40) << 8; } while (0) +#define GET_TIME (x) do { if (TSC_PRESENT) rdtscl(x); else { outb(0, 0x43); x = inb(0x40); x |= inb(0x40) << 8; } } while (0)#define DELTA (x,y) (TSC_PRESENT?((y)-(x)):((x)-(y)+((x)<(y)?1193180L/HZ:0)))#define TIME_NAME (TSC_PRESENT?"TSC":"PIT")#elif __x86_64__
Signature · 2 lines
Vojtech Pavlik SuSE Labs