X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=compat.h;h=29ccdb7f3ece2eb6aa532c5dd71dea8a02be9d6a;hb=3be51e20cb5458c8975d7980404dd962b021b616;hp=d51239777cd106336f812c1e3dabbd93d8f16525;hpb=63613d0d387a3b24fab738cbc6c255efb2a0e4f2;p=groeck-it87 diff --git a/compat.h b/compat.h index d512397..29ccdb7 100644 --- a/compat.h +++ b/compat.h @@ -9,16 +9,43 @@ #ifndef COMPAT_H #define COMPAT_H -#ifndef kstrtol -#define kstrtol strict_strtol -#endif -#ifndef kstrtoul -#define kstrtoul strict_strtoul +#include + +#ifndef clamp_val +#define clamp_val SENSORS_LIMIT #endif #ifndef request_muxed_region -#define request_muxed_region(a, b, c) (true) -#define release_region(a, b) +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 28) +#define request_muxed_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name)) +#else +#define IORESOURCE_MUXED 0x00400000 +#define request_muxed_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name), IORESOURCE_MUXED) +#endif +#endif + +/* Red Hat EL5 includes backports of these functions, so we can't redefine + * our own. */ +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 24) +#if !(defined RHEL_MAJOR && RHEL_MAJOR == 5 && RHEL_MINOR >= 5) +static inline int strict_strtoul(const char *cp, unsigned int base, + unsigned long *res) +{ + *res = simple_strtoul(cp, NULL, base); + return 0; +} + +static inline int strict_strtol(const char *cp, unsigned int base, long *res) +{ + *res = simple_strtol(cp, NULL, base); + return 0; +} +#endif +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) +#define kstrtoul strict_strtoul +#define kstrtol strict_strtol #endif #endif /* COMPAT_H */