|
 |
4a69e1d |
--- util-linux-2.13-pre6/disk-utils/mkswap.c.page 2006-06-12 17:30:57.000000000 +0200
|
|
|
4a69e1d |
+++ util-linux-2.13-pre6/disk-utils/mkswap.c 2006-06-12 17:30:31.000000000 +0200
|
|
|
4a69e1d |
@@ -53,17 +53,6 @@
|
|
|
4a69e1d |
#include <uuid/uuid.h>
|
|
|
4a69e1d |
#endif
|
|
|
4a69e1d |
|
|
|
4a69e1d |
-/* Try to get PAGE_SIZE from libc or kernel includes */
|
|
|
4a69e1d |
-#ifdef HAVE_SYS_USER_H
|
|
|
4a69e1d |
- /* Note: <sys/user.h> says: for gdb only */
|
|
|
4a69e1d |
-#include <sys/user.h> /* for PAGE_SIZE and PAGE_SHIFT */
|
|
|
4a69e1d |
-#else
|
|
|
4a69e1d |
-#ifdef HAVE_ASM_PAGE_H
|
|
|
4a69e1d |
-#include <asm/page.h> /* for PAGE_SIZE and PAGE_SHIFT */
|
|
|
4a69e1d |
- /* we also get PAGE_SIZE via getpagesize() */
|
|
|
4a69e1d |
-#endif
|
|
|
4a69e1d |
-#endif
|
|
|
4a69e1d |
-
|
|
|
4a69e1d |
#ifndef _IO
|
|
|
4a69e1d |
/* pre-1.3.45 */
|
|
|
4a69e1d |
#define BLKGETSIZE 0x1260
|
|
|
4a69e1d |
@@ -172,10 +161,6 @@
|
|
|
4a69e1d |
|
|
|
4a69e1d |
static void
|
|
|
4a69e1d |
init_signature_page(void) {
|
|
|
4a69e1d |
-
|
|
|
4a69e1d |
-#ifdef PAGE_SIZE
|
|
|
4a69e1d |
- defined_pagesize = PAGE_SIZE;
|
|
|
4a69e1d |
-#endif
|
|
|
4a69e1d |
kernel_pagesize = getpagesize();
|
|
|
4a69e1d |
pagesize = kernel_pagesize;
|
|
|
4a69e1d |
|
|
|
4a69e1d |
--- util-linux-2.13-pre6/configure.ac.page 2006-06-12 17:28:51.000000000 +0200
|
|
|
4a69e1d |
+++ util-linux-2.13-pre6/configure.ac 2006-06-12 17:28:28.000000000 +0200
|
|
|
4a69e1d |
@@ -26,7 +26,8 @@
|
|
|
4a69e1d |
])
|
|
|
4a69e1d |
AC_CHECK_HEADERS(langinfo.h)
|
|
|
4a69e1d |
AC_CHECK_HEADERS(sys/user.h)
|
|
|
4a69e1d |
-AC_CHECK_HEADERS(asm/page.h)
|
|
|
4a69e1d |
+# Suck ...
|
|
|
4a69e1d |
+#AC_CHECK_HEADERS(asm/page.h)
|
|
|
4a69e1d |
AC_CHECK_HEADERS(rpcsvc/nfs_prot.h)
|
|
|
4a69e1d |
AC_CHECK_HEADERS(sys/io.h)
|
|
|
4a69e1d |
AC_CHECK_HEADERS(pty.h)
|
|
|
4a69e1d |
--- util-linux-2.13-pre6/mount/swap.configure.page 2006-06-12 17:23:27.000000000 +0200
|
|
|
4a69e1d |
+++ util-linux-2.13-pre6/mount/swap.configure 2006-06-12 17:25:28.000000000 +0200
|
|
|
4a69e1d |
@@ -3,7 +3,7 @@
|
|
|
4a69e1d |
|
|
|
4a69e1d |
# Prepare test
|
|
|
4a69e1d |
CC=${CC-cc}
|
|
|
4a69e1d |
-compile="$CC -o conftest conftest.c >/dev/null 2>&1"
|
|
|
4a69e1d |
+compile="$CC -o conftest conftest.c"
|
|
|
4a69e1d |
rm -f conftest conftest.c swapargs.h
|
|
|
4a69e1d |
|
|
|
4a69e1d |
# What include files shall we try?
|
|
|
4a69e1d |
@@ -14,9 +14,10 @@
|
|
|
4a69e1d |
PAGEH=
|
|
|
4a69e1d |
if [ -f /usr/include/sys/swap.h ]; then
|
|
|
4a69e1d |
SWAPH="#include <sys/swap.h>"
|
|
|
4a69e1d |
- if [ -f /usr/include/asm/page.h ]; then
|
|
|
4a69e1d |
- PAGEH="#include <asm/page.h>"
|
|
|
4a69e1d |
- fi
|
|
|
4a69e1d |
+ # Suck ...
|
|
|
4a69e1d |
+ #if [ -f /usr/include/asm/page.h ]; then
|
|
|
4a69e1d |
+ # PAGEH="#include <asm/page.h>"
|
|
|
4a69e1d |
+ #fi
|
|
|
4a69e1d |
fi
|
|
|
4a69e1d |
echo $PAGEH > conftest.c
|
|
|
4a69e1d |
echo $SWAPH >> conftest.c
|