Commit c4919e56 authored by Alex Williamson's avatar Alex Williamson Committed by David Mosberger

[PATCH] ia64: delete McKinley A-stepping code

The patch below removes the config option and one bit of code for
McKinley A0/A1 CPU workarounds.  These CPUs were never used in
production, and IIRC this workaround really only affected X11.
Signed-off-by: default avatarDavid Mosberger <davidm@hpl.hp.com>
parent 501a9693
...@@ -149,20 +149,6 @@ config IA64_L1_CACHE_SHIFT ...@@ -149,20 +149,6 @@ config IA64_L1_CACHE_SHIFT
default "6" if ITANIUM default "6" if ITANIUM
# align cache-sensitive data to 64 bytes # align cache-sensitive data to 64 bytes
config MCKINLEY_ASTEP_SPECIFIC
bool "McKinley A-step specific code"
depends on MCKINLEY
help
Select this option to build a kernel for an IA-64 McKinley prototype
system with any A-stepping CPU.
config MCKINLEY_A0_SPECIFIC
bool "McKinley A0/A1-step specific code"
depends on MCKINLEY_ASTEP_SPECIFIC
help
Select this option to build a kernel for an IA-64 McKinley prototype
system with an A0 or A1 stepping CPU.
config NUMA config NUMA
bool "NUMA support" bool "NUMA support"
depends on !IA64_HP_SIM depends on !IA64_HP_SIM
......
...@@ -297,11 +297,7 @@ ia64_phys_addr_valid (unsigned long addr) ...@@ -297,11 +297,7 @@ ia64_phys_addr_valid (unsigned long addr)
* works bypasses the caches, but does allow for consecutive writes to * works bypasses the caches, but does allow for consecutive writes to
* be combined into single (but larger) write transactions. * be combined into single (but larger) write transactions.
*/ */
#ifdef CONFIG_MCKINLEY_A0_SPECIFIC #define pgprot_writecombine(prot) __pgprot((pgprot_val(prot) & ~_PAGE_MA_MASK) | _PAGE_MA_WC)
# define pgprot_writecombine(prot) prot
#else
# define pgprot_writecombine(prot) __pgprot((pgprot_val(prot) & ~_PAGE_MA_MASK) | _PAGE_MA_WC)
#endif
static inline unsigned long static inline unsigned long
pgd_index (unsigned long address) pgd_index (unsigned long address)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment