forked from grate-driver/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'slub/lockless' into for-linus
Conflicts: include/linux/slub_def.h
- Loading branch information
Showing
25 changed files
with
505 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -136,7 +136,7 @@ SECTIONS | |
|
||
. = ALIGN(16); | ||
INIT_DATA_SECTION(16) | ||
PERCPU(4) | ||
PERCPU(32, 4) | ||
|
||
.exit.data : | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,7 +42,7 @@ | |
INIT_SETUP(0) | ||
} | ||
|
||
PERCPU(32) | ||
PERCPU(32, 32) | ||
|
||
.initcall.init : { | ||
INIT_CALLS | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* | ||
* This program is free software; you can redistribute it and/or | ||
* modify it under the terms of the GNU General Public License | ||
* as published by the Free Software Foundation; version 2 | ||
* of the License. | ||
* | ||
*/ | ||
#include <linux/linkage.h> | ||
#include <asm/alternative-asm.h> | ||
#include <asm/frame.h> | ||
#include <asm/dwarf2.h> | ||
|
||
.text | ||
|
||
/* | ||
* Inputs: | ||
* %rsi : memory location to compare | ||
* %rax : low 64 bits of old value | ||
* %rdx : high 64 bits of old value | ||
* %rbx : low 64 bits of new value | ||
* %rcx : high 64 bits of new value | ||
* %al : Operation successful | ||
*/ | ||
ENTRY(this_cpu_cmpxchg16b_emu) | ||
CFI_STARTPROC | ||
|
||
# | ||
# Emulate 'cmpxchg16b %gs:(%rsi)' except we return the result in %al not | ||
# via the ZF. Caller will access %al to get result. | ||
# | ||
# Note that this is only useful for a cpuops operation. Meaning that we | ||
# do *not* have a fully atomic operation but just an operation that is | ||
# *atomic* on a single cpu (as provided by the this_cpu_xx class of | ||
# macros). | ||
# | ||
this_cpu_cmpxchg16b_emu: | ||
pushf | ||
cli | ||
|
||
cmpq %gs:(%rsi), %rax | ||
jne not_same | ||
cmpq %gs:8(%rsi), %rdx | ||
jne not_same | ||
|
||
movq %rbx, %gs:(%rsi) | ||
movq %rcx, %gs:8(%rsi) | ||
|
||
popf | ||
mov $1, %al | ||
ret | ||
|
||
not_same: | ||
popf | ||
xor %al,%al | ||
ret | ||
|
||
CFI_ENDPROC | ||
|
||
ENDPROC(this_cpu_cmpxchg16b_emu) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.