|
|
@ -1,52 +0,0 @@ |
|
|
|
# --- 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/linux26/76-no-new-variable.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 --- |
|
|
|
|
|
|
|
--- ./include/asm-i386/system.h.vanilla 2006-01-10 17:46:21.000000000 +0100
|
|
|
|
+++ ./include/asm-i386/system.h 2006-01-10 17:48:39.000000000 +0100
|
|
|
|
@@ -269,26 +269,26 @@
|
|
|
|
#endif |
|
|
|
|
|
|
|
static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, |
|
|
|
- unsigned long new, int size)
|
|
|
|
+ unsigned long ulnew, int size)
|
|
|
|
{ |
|
|
|
unsigned long prev; |
|
|
|
switch (size) { |
|
|
|
case 1: |
|
|
|
__asm__ __volatile__(LOCK_PREFIX "cmpxchgb %b1,%2" |
|
|
|
: "=a"(prev) |
|
|
|
- : "q"(new), "m"(*__xg(ptr)), "0"(old)
|
|
|
|
+ : "q"(ulnew), "m"(*__xg(ptr)), "0"(old)
|
|
|
|
: "memory"); |
|
|
|
return prev; |
|
|
|
case 2: |
|
|
|
__asm__ __volatile__(LOCK_PREFIX "cmpxchgw %w1,%2" |
|
|
|
: "=a"(prev) |
|
|
|
- : "r"(new), "m"(*__xg(ptr)), "0"(old)
|
|
|
|
+ : "r"(ulnew), "m"(*__xg(ptr)), "0"(old)
|
|
|
|
: "memory"); |
|
|
|
return prev; |
|
|
|
case 4: |
|
|
|
__asm__ __volatile__(LOCK_PREFIX "cmpxchgl %1,%2" |
|
|
|
: "=a"(prev) |
|
|
|
- : "r"(new), "m"(*__xg(ptr)), "0"(old)
|
|
|
|
+ : "r"(ulnew), "m"(*__xg(ptr)), "0"(old)
|
|
|
|
: "memory"); |
|
|
|
return prev; |
|
|
|
} |