[BusyBox-cvs] busybox/util-linux fdisk.c,1.12,1.13

Erik Andersen andersen at busybox.net
Thu Dec 4 07:07:18 UTC 2003


Update of /var/cvs/busybox/util-linux
In directory winder:/tmp/cvs-serv3583/util-linux

Modified Files:
	fdisk.c 
Log Message:
Do not use the _syscall5 macro -- use syscall(2) instead


Index: fdisk.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/fdisk.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- fdisk.c	14 Nov 2003 02:40:08 -0000	1.12
+++ fdisk.c	4 Dec 2003 07:07:14 -0000	1.13
@@ -847,7 +847,7 @@
 #define SUN_SSWAP32(x) (sun_other_endian ? __swap32(x) \
 				 : (uint32_t)(x))
 
-#if defined(FDISK_SUPPORT_LARGE_DISKS)
+#if defined(CONFIG_LFS) || defined(FDISK_SUPPORT_LARGE_DISKS)
 /*
  * llseek.c -- stub calling the llseek system call
  *
@@ -856,21 +856,13 @@
  */
 
 
-#include <syscall.h>
-
-
 #if defined(__alpha__) || defined(__ia64__) || defined(__s390x__)
 
 #define my_llseek lseek
 
 #else
 
-static int _llseek (unsigned int, unsigned long,
-		   unsigned long, fdisk_loff_t *, unsigned int);
-
-static _syscall5(int,_llseek,unsigned int,f_d,unsigned long,offset_high,
-		 unsigned long, offset_low,fdisk_loff_t *,result,
-		 unsigned int, origin);
+#include <syscall.h>
 
 static fdisk_loff_t my_llseek (unsigned int f_d, fdisk_loff_t offset,
 		unsigned int origin)
@@ -878,7 +870,7 @@
 	fdisk_loff_t result;
 	int retval;
 
-	retval = _llseek (f_d, ((unsigned long long) offset) >> 32,
+	retval = syscall(__NR__llseek, f_d, ((unsigned long long) offset) >> 32,
 			((unsigned long long) offset) & 0xffffffff,
 			&result, origin);
 	return (retval == -1 ? (fdisk_loff_t) retval : result);




More information about the busybox-cvs mailing list