Browse Source

Daniel Jahre:


			
			
				rocklinux
			
			
		
Daniel Jahre 17 years ago
parent
commit
a8be4c864b
2 changed files with 2 additions and 54 deletions
  1. +2
    -2
      package/base/linux/linux.desc
  2. +0
    -52
      package/base/linux/linux26/76-no-new-variable.patch

+ 2
- 2
package/base/linux/linux.desc

@ -50,8 +50,8 @@
#endif
#if xpkg == linux26.*
[V] 2.6.21.5
[D] 2287474728 linux-2.6.21.5.tar.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/
[V] 2.6.22.1
[D] 3202303695 linux-2.6.22.1.tar.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/
#endif
[CD] <COPY> for x in $cachedir/linux2[46].cache; do cp $x $confdir/$pkg.cache; done

+ 0
- 52
package/base/linux/linux26/76-no-new-variable.patch

@ -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;
}

Loading…
Cancel
Save