Minor tweaks for McKinley-optimized copy_page().

Fix configuration for HP Ski simulator.

diff --git a/arch/ia64/hp/Config.in b/arch/ia64/hp/Config.in
new file mode 100644 (file)
index 0000000..e8cda10
--- /dev/null
+++ b/arch/ia64/hp/Config.in
@@ -0,0 +1,9 @@
+mainmenu_option next_comment
+comment 'HP Simulator drivers'
+
+bool 'Simulated Ethernet ' CONFIG_HP_SIMETH
+bool 'Simulated serial driver support' CONFIG_HP_SIMSERIAL
+if [ "$CONFIG_SCSI" != "n" ]; then
+  bool 'Simulated SCSI disk' CONFIG_HP_SIMSCSI
+fi
+endmenu

diff --git a/arch/ia64/hp/Makefile b/arch/ia64/hp/Makefile
index 642a03c2d488fb316c4a0c84cd70e56097a96524..27ce8332151802c74cdf7bb03e2a06c31e336d57 100644 (file)
--- a/arch/ia64/hp/Makefile
+++ b/arch/ia64/hp/Makefile
@@ -14,9 +14,9 @@ O_TARGET := hp.a
 obj-y := hpsim_console.o hpsim_irq.o hpsim_setup.o
 obj-$(CONFIG_IA64_GENERIC) += hpsim_machvec.o
 
-obj-$(CONFIG_SIMETH)   += simeth.o
-obj-$(CONFIG_SIM_SERIAL) += simserial.o
-obj-$(CONFIG_SCSI_SIM) += simscsi.o
+obj-$(CONFIG_HP_SIMETH)        += simeth.o
+obj-$(CONFIG_HP_SIMSERIAL) += simserial.o
+obj-$(CONFIG_HP_SIMSCSI) += simscsi.o
 
 clean::
 

diff --git a/arch/ia64/lib/Makefile b/arch/ia64/lib/Makefile
index 714aa1ffb3a9f2efbcc88fdc4f838c331b766a80..a53fa02c07c4f16a7be036f569e3e70805f83dbb 100644 (file)
--- a/arch/ia64/lib/Makefile
+++ b/arch/ia64/lib/Makefile
@@ -16,6 +16,9 @@ obj-y := __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o                                        \
        flush.o io.o do_csum.o                                                          \
        memcpy.o memset.o strlen.o swiotlb.o
 
+obj-$(CONFIG_ITANIUM) += copy_page.o
+obj-$(CONFIG_MCKINLEY) += copy_page_mck.o
+
 IGNORE_FLAGS_OBJS =    __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o \
                        __divdi3.o __udivdi3.o __moddi3.o __umoddi3.o
 

diff --git a/arch/ia64/lib/copy_page_mck.S b/arch/ia64/lib/copy_page_mck.S
index d0a131f561f5e57ce4642ce2a9d3abdf28eeb776..49b381c98306995fdae1c48dc700ec8d747b62d2 100644 (file)
--- a/arch/ia64/lib/copy_page_mck.S
+++ b/arch/ia64/lib/copy_page_mck.S
@@ -43,7 +43,7 @@
  *
  *     When reading the code, it helps to keep the following picture in mind:
  *
- *            bank 0 bank 1
+ *            word 0 word 1
  *            +------+------+---
  *           | v[x] |  t1  | ^
  *           | t2   |  t3  | |