mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

33 lines
1.0 KiB

  1. --- ./include/asm-i386/system.h 2004-12-29 20:54:20.072258656 +0000
  2. +++ ./include/asm-i386/system.h-p 2004-12-29 21:11:17.462591816 +0000
  3. @@ -244,26 +244,26 @@
  4. #endif
  5. static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
  6. - unsigned long new, int size)
  7. + unsigned long ulnew, int size)
  8. {
  9. unsigned long prev;
  10. switch (size) {
  11. case 1:
  12. __asm__ __volatile__(LOCK_PREFIX "cmpxchgb %b1,%2"
  13. : "=a"(prev)
  14. - : "q"(new), "m"(*__xg(ptr)), "0"(old)
  15. + : "q"(ulnew), "m"(*__xg(ptr)), "0"(old)
  16. : "memory");
  17. return prev;
  18. case 2:
  19. __asm__ __volatile__(LOCK_PREFIX "cmpxchgw %w1,%2"
  20. : "=a"(prev)
  21. - : "q"(new), "m"(*__xg(ptr)), "0"(old)
  22. + : "q"(ulnew), "m"(*__xg(ptr)), "0"(old)
  23. : "memory");
  24. return prev;
  25. case 4:
  26. __asm__ __volatile__(LOCK_PREFIX "cmpxchgl %1,%2"
  27. : "=a"(prev)
  28. - : "q"(new), "m"(*__xg(ptr)), "0"(old)
  29. + : "q"(ulnew), "m"(*__xg(ptr)), "0"(old)
  30. : "memory");
  31. return prev;
  32. }