diff options
| author | Josiah Worcester | 2011-06-09 00:52:48 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-06-14 14:16:07 +0200 |
| commit | 363ce07137ca8e5be1ff24763e34679b9dd9c3e2 (patch) | |
| tree | 684336f58a2b9f81a7d47b65a090433519831cc7 | |
| parent | test_sysinfo: Use CHAR_BIT*sizeof(void*) instead of __WORDSIZE. (diff) | |
| download | kernel-qcow2-util-linux-363ce07137ca8e5be1ff24763e34679b9dd9c3e2.tar.gz kernel-qcow2-util-linux-363ce07137ca8e5be1ff24763e34679b9dd9c3e2.tar.xz kernel-qcow2-util-linux-363ce07137ca8e5be1ff24763e34679b9dd9c3e2.zip | |
hwclock: Don't use asm/io.h if sys/io.h can't be found
[kzak@redhat.com: - check for obsolete asm/io.h in configure.ac]
Signed-off-by: Josiah Worcester <josiahw@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | hwclock/cmos.c | 18 |
2 files changed, 14 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 3524623e6..52eade9e1 100644 --- a/configure.ac +++ b/configure.ac @@ -135,6 +135,7 @@ AC_CHECK_HEADERS( netinet/in.h \ rpcsvc/nfs_prot.h \ stdlib.h \ + asm/io.h \ sys/disk.h \ sys/disklabel.h \ sys/ioctl.h \ diff --git a/hwclock/cmos.c b/hwclock/cmos.c index 947b21bea..0178ef7d3 100644 --- a/hwclock/cmos.c +++ b/hwclock/cmos.c @@ -50,11 +50,19 @@ #include "nls.h" #if defined(__i386__) -#ifdef HAVE_SYS_IO_H -#include <sys/io.h> -#else -#include <asm/io.h> /* for inb, outb */ -#endif + +# ifdef HAVE_SYS_IO_H +# include <sys/io.h> +# elif defined(HAVE_ASM_IO_H) +# include <asm/io.h> /* for inb, outb */ +# else +/* Disable cmos access; we can no longer use asm/io.h, since + * the kernel does not export that header. */ +# undef __i386__ +void outb(int a, int b){} +int inb(int c){ return 0; } +# endif + #elif defined(__alpha__) /* <asm/io.h> fails to compile, probably because of u8 etc */ extern unsigned int inb(unsigned long port); |