diff options
author | Eric Andersen <andersen@codepoet.org> | 2003-12-04 07:07:14 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2003-12-04 07:07:14 +0000 |
commit | 50547c07451d07178eeb64e7d8637952b427bd4c (patch) | |
tree | 871484e83a0f434f181733b3174efbcfe89a0168 /util-linux/fdisk.c | |
parent | 3860b2ebd6ad9c68a087c2addd1f1c592aaeaee9 (diff) | |
download | busybox-w32-50547c07451d07178eeb64e7d8637952b427bd4c.tar.gz busybox-w32-50547c07451d07178eeb64e7d8637952b427bd4c.tar.bz2 busybox-w32-50547c07451d07178eeb64e7d8637952b427bd4c.zip |
Do not use the _syscall5 macro -- use syscall(2) instead
Diffstat (limited to 'util-linux/fdisk.c')
-rw-r--r-- | util-linux/fdisk.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index ca682f745..bd929d88d 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
@@ -847,7 +847,7 @@ typedef struct { | |||
847 | #define SUN_SSWAP32(x) (sun_other_endian ? __swap32(x) \ | 847 | #define SUN_SSWAP32(x) (sun_other_endian ? __swap32(x) \ |
848 | : (uint32_t)(x)) | 848 | : (uint32_t)(x)) |
849 | 849 | ||
850 | #if defined(FDISK_SUPPORT_LARGE_DISKS) | 850 | #if defined(CONFIG_LFS) || defined(FDISK_SUPPORT_LARGE_DISKS) |
851 | /* | 851 | /* |
852 | * llseek.c -- stub calling the llseek system call | 852 | * llseek.c -- stub calling the llseek system call |
853 | * | 853 | * |
@@ -856,21 +856,13 @@ typedef struct { | |||
856 | */ | 856 | */ |
857 | 857 | ||
858 | 858 | ||
859 | #include <syscall.h> | ||
860 | |||
861 | |||
862 | #if defined(__alpha__) || defined(__ia64__) || defined(__s390x__) | 859 | #if defined(__alpha__) || defined(__ia64__) || defined(__s390x__) |
863 | 860 | ||
864 | #define my_llseek lseek | 861 | #define my_llseek lseek |
865 | 862 | ||
866 | #else | 863 | #else |
867 | 864 | ||
868 | static int _llseek (unsigned int, unsigned long, | 865 | #include <syscall.h> |
869 | unsigned long, fdisk_loff_t *, unsigned int); | ||
870 | |||
871 | static _syscall5(int,_llseek,unsigned int,f_d,unsigned long,offset_high, | ||
872 | unsigned long, offset_low,fdisk_loff_t *,result, | ||
873 | unsigned int, origin); | ||
874 | 866 | ||
875 | static fdisk_loff_t my_llseek (unsigned int f_d, fdisk_loff_t offset, | 867 | static fdisk_loff_t my_llseek (unsigned int f_d, fdisk_loff_t offset, |
876 | unsigned int origin) | 868 | unsigned int origin) |
@@ -878,7 +870,7 @@ static fdisk_loff_t my_llseek (unsigned int f_d, fdisk_loff_t offset, | |||
878 | fdisk_loff_t result; | 870 | fdisk_loff_t result; |
879 | int retval; | 871 | int retval; |
880 | 872 | ||
881 | retval = _llseek (f_d, ((unsigned long long) offset) >> 32, | 873 | retval = syscall(__NR__llseek, f_d, ((unsigned long long) offset) >> 32, |
882 | ((unsigned long long) offset) & 0xffffffff, | 874 | ((unsigned long long) offset) & 0xffffffff, |
883 | &result, origin); | 875 | &result, origin); |
884 | return (retval == -1 ? (fdisk_loff_t) retval : result); | 876 | return (retval == -1 ? (fdisk_loff_t) retval : result); |