util-linux-swap-page.patch

   1 Don't use asm/page.h
   2
   3 --- util-linux-2.13-pre6/disk-utils/mkswap.c.page       2006-06-12 17:30:57.000000000 +0200
   4 +++ util-linux-2.13-pre6/disk-utils/mkswap.c    2006-06-12 17:30:31.000000000 +0200
   5 @@ -53,17 +53,6 @@
   6  #include <uuid/uuid.h>
   7  #endif
   8
   9 -/* Try to get PAGE_SIZE from libc or kernel includes */
  10 -#ifdef HAVE_SYS_USER_H
  11 -                               /* Note: <sys/user.h> says: for gdb only */
  12 -#include <sys/user.h>          /* for PAGE_SIZE and PAGE_SHIFT */
  13 -#else
  14 -#ifdef HAVE_ASM_PAGE_H
  15 -#include <asm/page.h>          /* for PAGE_SIZE and PAGE_SHIFT */
  16 -                               /* we also get PAGE_SIZE via getpagesize() */
  17 -#endif
  18 -#endif
  19 -
  20  #ifndef _IO
  21  /* pre-1.3.45 */
  22  #define BLKGETSIZE 0x1260
  23 @@ -172,10 +161,6 @@
  24
  25  static void
  26  init_signature_page(void) {
  27 -
  28 -#ifdef PAGE_SIZE
  29 -       defined_pagesize = PAGE_SIZE;
  30 -#endif
  31         kernel_pagesize = getpagesize();
  32         pagesize = kernel_pagesize;
  33
  34 --- util-linux-2.13-pre6/configure.ac.page      2006-06-12 17:28:51.000000000 +0200
  35 +++ util-linux-2.13-pre6/configure.ac   2006-06-12 17:28:28.000000000 +0200
  36 @@ -26,7 +26,8 @@
  37  ])
  38  AC_CHECK_HEADERS(langinfo.h)
  39  AC_CHECK_HEADERS(sys/user.h)
  40 -AC_CHECK_HEADERS(asm/page.h)
  41 +# Suck ...
  42 +#AC_CHECK_HEADERS(asm/page.h)
  43  AC_CHECK_HEADERS(rpcsvc/nfs_prot.h)
  44  AC_CHECK_HEADERS(sys/io.h)
  45  AC_CHECK_HEADERS(pty.h)
  46 --- util-linux-2.13-pre6/mount/swap.configure.page      2006-06-12 17:23:27.000000000 +0200
  47 +++ util-linux-2.13-pre6/mount/swap.configure   2006-06-12 17:25:28.000000000 +0200
  48 @@ -3,7 +3,7 @@
  49
  50  # Prepare test
  51  CC=${CC-cc}
  52 -compile="$CC -o conftest conftest.c >/dev/null 2>&1"
  53 +compile="$CC -o conftest conftest.c"
  54  rm -f conftest conftest.c swapargs.h
  55
  56  # What include files shall we try?
  57 @@ -14,9 +14,10 @@
  58  PAGEH=
  59  if [ -f /usr/include/sys/swap.h ]; then
  60         SWAPH="#include <sys/swap.h>"
  61 -       if [ -f /usr/include/asm/page.h ]; then
  62 -               PAGEH="#include <asm/page.h>"
  63 -       fi
  64 +       # Suck ...
  65 +       #if [ -f /usr/include/asm/page.h ]; then
  66 +       #       PAGEH="#include <asm/page.h>"
  67 +       #fi
  68  fi
  69  echo $PAGEH > conftest.c
  70  echo $SWAPH >> conftest.c