git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
mmu_context.h
diff --git
a/arch/x86/include/asm/mmu_context.h
b/arch/x86/include/asm/mmu_context.h
index bbc796eb0a3b91ee1d1686060ee4ef10ac44fff8..eeeb9289c764db96099caea715682411d79396c8 100644
(file)
--- a/
arch/x86/include/asm/mmu_context.h
+++ b/
arch/x86/include/asm/mmu_context.h
@@
-71,12
+71,7
@@
struct ldt_struct {
static inline void *ldt_slot_va(int slot)
{
-#ifdef CONFIG_X86_64
return (void *)(LDT_BASE_ADDR + LDT_SLOT_STRIDE * slot);
-#else
- BUG();
- return (void *)fix_to_virt(FIX_HOLE);
-#endif
}
/*