summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/shmparam.h
diff options
context:
space:
mode:
authorIngo Molnar2008-08-14 12:19:59 +0200
committerIngo Molnar2008-08-14 12:19:59 +0200
commit8d7ccaa545490cdffdfaff0842436a8dd85cf47b (patch)
tree8129b5907161bc6ae26deb3645ce1e280c5e1f51 /include/asm-ia64/shmparam.h
parentX86_SMP: tlb_XX.c declare smp_invalidate_interrupt before they get used (diff)
parentLinux 2.6.27-rc3 (diff)
downloadkernel-qcow2-linux-8d7ccaa545490cdffdfaff0842436a8dd85cf47b.tar.gz
kernel-qcow2-linux-8d7ccaa545490cdffdfaff0842436a8dd85cf47b.tar.xz
kernel-qcow2-linux-8d7ccaa545490cdffdfaff0842436a8dd85cf47b.zip
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts: include/asm-x86/dma-mapping.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-ia64/shmparam.h')
-rw-r--r--include/asm-ia64/shmparam.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/include/asm-ia64/shmparam.h b/include/asm-ia64/shmparam.h
deleted file mode 100644
index d07508dc54ae..000000000000
--- a/include/asm-ia64/shmparam.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_IA64_SHMPARAM_H
-#define _ASM_IA64_SHMPARAM_H
-
-/*
- * SHMLBA controls minimum alignment at which shared memory segments
- * get attached. The IA-64 architecture says that there may be a
- * performance degradation when there are virtual aliases within 1MB.
- * To reduce the chance of this, we set SHMLBA to 1MB. --davidm 00/12/20
- */
-#define SHMLBA (1024*1024)
-
-#endif /* _ASM_IA64_SHMPARAM_H */