mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 02:27:54 +02:00
17ba4f4f6a
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: fa3180007502affabbe57cb6366be18fbb9e94f8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
56 lines
1.5 KiB
Diff
56 lines
1.5 KiB
Diff
Upstream-Status: Pending
|
|
|
|
---
|
|
libparted/arch/linux.c | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
Index: parted-3.2/libparted/arch/linux.c
|
|
===================================================================
|
|
--- parted-3.2.orig/libparted/arch/linux.c
|
|
+++ parted-3.2/libparted/arch/linux.c
|
|
@@ -17,6 +17,8 @@
|
|
|
|
#define PROC_DEVICES_BUFSIZ 16384
|
|
|
|
+#include <linux/version.h>
|
|
+
|
|
#include <config.h>
|
|
#include <arch/linux.h>
|
|
#include <linux/blkpg.h>
|
|
@@ -1696,12 +1698,14 @@ linux_refresh_close (PedDevice* dev)
|
|
|
|
#if SIZEOF_OFF_T < 8
|
|
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
|
|
static _syscall5(int,_llseek,
|
|
unsigned int, fd,
|
|
unsigned long, offset_high,
|
|
unsigned long, offset_low,
|
|
loff_t*, result,
|
|
unsigned int, origin)
|
|
+#endif
|
|
|
|
loff_t
|
|
llseek (unsigned int fd, loff_t offset, unsigned int whence)
|
|
@@ -1709,11 +1713,20 @@ llseek (unsigned int fd, loff_t offset,
|
|
loff_t result;
|
|
int retval;
|
|
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
|
|
retval = _llseek(fd,
|
|
((unsigned long long)offset) >> 32,
|
|
((unsigned long long)offset) & 0xffffffff,
|
|
&result,
|
|
whence);
|
|
+#else
|
|
+ retval = syscall(__NR__llseek, fd,
|
|
+ ((unsigned long long)offset) >> 32,
|
|
+ ((unsigned long long)offset) & 0xffffffff,
|
|
+ &result,
|
|
+ whence);
|
|
+#endif
|
|
+
|
|
return (retval==-1 ? (loff_t) retval : result);
|
|
}
|
|
|