diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-16 19:28:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-16 19:28:33 -0700 |
| commit | c334ba9e11849f0f23254d82a3305f6174cfbd95 (patch) | |
| tree | 3a5ab19da9cea03165a6b6d889ef28cd12437e13 /include | |
| parent | 47455911674d65fba28d43f4135c28ee40c75bac (diff) | |
| parent | d1acb4210aaa9bdc413d276dbc96d0a23ada97ba (diff) | |
| download | op-kernel-dev-c334ba9e11849f0f23254d82a3305f6174cfbd95.zip op-kernel-dev-c334ba9e11849f0f23254d82a3305f6174cfbd95.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Get DEBUG_PAGEALLOC working again.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/tsb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-sparc64/tsb.h b/include/asm-sparc64/tsb.h index e82612c..ab55ffc 100644 --- a/include/asm-sparc64/tsb.h +++ b/include/asm-sparc64/tsb.h @@ -264,6 +264,7 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end; be,a,pt %xcc, OK_LABEL; \ mov REG4, REG1; +#ifndef CONFIG_DEBUG_PAGEALLOC /* This version uses a trick, the TAG is already (VADDR >> 22) so * we can make use of that for the index computation. */ @@ -277,5 +278,6 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end; cmp REG3, TAG; \ be,a,pt %xcc, OK_LABEL; \ mov REG4, REG1; +#endif #endif /* !(_SPARC64_TSB_H) */ |
