# --- ROCK-COPYRIGHT-NOTE-BEGIN --- # # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # Please add additional copyright information _after_ the line containing # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/linux/linux24/99-byteorder-i386.patch # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf # # This patch file is dual-licensed. It is available under the license the # patched project is licensed under, as long as it is an OpenSource license # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms # of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # # --- ROCK-COPYRIGHT-NOTE-END --- Fix for useage in user-space applications, e.g. kdemultimedia. - Rene Rebe --- linux/include/asm-i386/byteorder.h 2003-08-23 22:00:53.000000000 +0200 +++ linux/include/asm-i386/byteorder.h 2003-08-23 21:58:06.000000000 +0200 @@ -35,8 +35,8 @@ } -static inline __u64 ___arch__swab64(__u64 val) +static __inline__ __u64 ___arch__swab64(__u64 val) { union { struct { __u32 a,b; } s; --- linux/include/asm-i386/byteorder.h 2003-08-23 22:00:53.000000000 +0200 +++ linux/include/asm-i386/byteorder.h 2003-08-23 21:58:06.000000000 +0200 @@ -43,13 +43,13 @@ } v; v.u = val; #ifdef CONFIG_X86_BSWAP - asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1" + __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b)); #else v.s.a = ___arch__swab32(v.s.a); v.s.b = ___arch__swab32(v.s.b); - asm("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b)); + __asm__("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b)); #endif return v.u; }