tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

* 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
x86,percpu: Move out of place 64 bit ops into X86_64 section

Linus Torvalds ebe0d805 5bf7a650

+4 -4
+4 -4
arch/x86/include/asm/percpu.h
··· 414 414 #define this_cpu_xchg_1(pcp, nval) percpu_xchg_op(pcp, nval) 415 415 #define this_cpu_xchg_2(pcp, nval) percpu_xchg_op(pcp, nval) 416 416 #define this_cpu_xchg_4(pcp, nval) percpu_xchg_op(pcp, nval) 417 - #define this_cpu_xchg_8(pcp, nval) percpu_xchg_op(pcp, nval) 418 - #define this_cpu_cmpxchg_8(pcp, oval, nval) percpu_cmpxchg_op(pcp, oval, nval) 419 417 420 418 #define irqsafe_cpu_add_1(pcp, val) percpu_add_op((pcp), val) 421 419 #define irqsafe_cpu_add_2(pcp, val) percpu_add_op((pcp), val) ··· 430 432 #define irqsafe_cpu_xchg_1(pcp, nval) percpu_xchg_op(pcp, nval) 431 433 #define irqsafe_cpu_xchg_2(pcp, nval) percpu_xchg_op(pcp, nval) 432 434 #define irqsafe_cpu_xchg_4(pcp, nval) percpu_xchg_op(pcp, nval) 433 - #define irqsafe_cpu_xchg_8(pcp, nval) percpu_xchg_op(pcp, nval) 434 - #define irqsafe_cpu_cmpxchg_8(pcp, oval, nval) percpu_cmpxchg_op(pcp, oval, nval) 435 435 436 436 #ifndef CONFIG_M386 437 437 #define __this_cpu_add_return_1(pcp, val) percpu_add_return_op(pcp, val) ··· 471 475 #define this_cpu_or_8(pcp, val) percpu_to_op("or", (pcp), val) 472 476 #define this_cpu_xor_8(pcp, val) percpu_to_op("xor", (pcp), val) 473 477 #define this_cpu_add_return_8(pcp, val) percpu_add_return_op(pcp, val) 478 + #define this_cpu_xchg_8(pcp, nval) percpu_xchg_op(pcp, nval) 479 + #define this_cpu_cmpxchg_8(pcp, oval, nval) percpu_cmpxchg_op(pcp, oval, nval) 474 480 475 481 #define irqsafe_cpu_add_8(pcp, val) percpu_add_op((pcp), val) 476 482 #define irqsafe_cpu_and_8(pcp, val) percpu_to_op("and", (pcp), val) 477 483 #define irqsafe_cpu_or_8(pcp, val) percpu_to_op("or", (pcp), val) 478 484 #define irqsafe_cpu_xor_8(pcp, val) percpu_to_op("xor", (pcp), val) 485 + #define irqsafe_cpu_xchg_8(pcp, nval) percpu_xchg_op(pcp, nval) 486 + #define irqsafe_cpu_cmpxchg_8(pcp, oval, nval) percpu_cmpxchg_op(pcp, oval, nval) 479 487 #endif 480 488 481 489 /* This is not atomic against other CPUs -- CPU preemption needs to be off */