diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /hdparm | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'hdparm')
| -rw-r--r-- | hdparm/hdparm-5.4/bswap.patch | 32 | ||||
| -rw-r--r-- | hdparm/hdparm-5.4/readahead.patch | 32 |
2 files changed, 64 insertions, 0 deletions
diff --git a/hdparm/hdparm-5.4/bswap.patch b/hdparm/hdparm-5.4/bswap.patch index e69de29bb2..13670073a4 100644 --- a/hdparm/hdparm-5.4/bswap.patch +++ b/hdparm/hdparm-5.4/bswap.patch @@ -0,0 +1,32 @@ +diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c +--- hdparm-5.4/hdparm.c 2004-07-14 01:29:30.000000000 +0200 ++++ hdparm-5.4-fix/hdparm.c 2004-07-14 01:28:31.000000000 +0200 +@@ -20,7 +20,9 @@ + #include <linux/types.h> + #include <linux/hdreg.h> + #include <linux/major.h> +-#include <asm/byteorder.h> ++#include <byteswap.h> ++ ++#define le16_to_cpus(x) bswap_16(htons(x)) + + #include "hdparm.h" + +@@ -1299,7 +1301,7 @@ + } + } + for(i=0; i<(sizeof args)/2; i+=2) { +- __le16_to_cpus((__u16 *)(&args[i])); ++ le16_to_cpus(*(__u16 *)(&args[i])); + } + identify((void *)&args[4], NULL); + identify_abort: ; +@@ -1499,7 +1501,7 @@ + } + for (i = 0; count >= 4; ++i) { + sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]); +- __le16_to_cpus((__u16 *)(&sbuf[i])); ++ le16_to_cpus((__u16 *)(&sbuf[i])); + b += 5; + count -= 5; + } diff --git a/hdparm/hdparm-5.4/readahead.patch b/hdparm/hdparm-5.4/readahead.patch index e69de29bb2..2868d940d0 100644 --- a/hdparm/hdparm-5.4/readahead.patch +++ b/hdparm/hdparm-5.4/readahead.patch @@ -0,0 +1,32 @@ +diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c +--- hdparm-5.4/hdparm.c 2004-07-14 00:36:03.000000000 +0200 ++++ hdparm-5.4-fix/hdparm.c 2003-04-18 22:29:38.000000000 +0200 +@@ -52,7 +52,7 @@ + static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0; + static int do_ctimings, do_timings = 0; + +-static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0; ++static unsigned long set_readahead= 0, get_readahead= 0, readahead_state= 0; + static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; + static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; + static unsigned long set_mult = 0, get_mult = 0, mult = 0; +@@ -785,8 +785,8 @@ + + if (set_readahead) { + if (get_readahead) +- printf(" setting fs readahead to %ld\n", readahead); +- if (ioctl(fd, BLKRASET, readahead)) ++ printf(" setting fs readahead to %ld\n", readahead_state); ++ if (ioctl(fd, BLKRASET, readahead_state)) + perror(" BLKRASET failed"); + } + #ifdef HDIO_UNREGISTER_HWIF +@@ -1830,7 +1830,7 @@ + case 'a': + get_readahead = noisy; + noisy = 1; +- GET_NUMBER(set_readahead,readahead); ++ GET_NUMBER(set_readahead,readahead_state); + break; + case 'B': + get_apmmode = noisy; |