2 files changed, 15 insertions, 16 deletions

diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index ab9b5f35c2a7..a087b274847e 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -432,7 +432,7 @@ static int tiocx_reload(struct cx_dev *cx_dev)
         return cx_device_reload(cx_dev);
 }
 
-static ssize_t show_cxdev_control(struct device *dev, char *buf)
+static ssize_t show_cxdev_control(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct cx_dev *cx_dev = to_cx_dev(dev);
 
@@ -442,7 +442,7 @@ static ssize_t show_cxdev_control(struct device *dev, char *buf)
                        tiocx_btchar_get(cx_dev->cx_id.nasid));
 }
 
-static ssize_t store_cxdev_control(struct device *dev, const char *buf,
+static ssize_t store_cxdev_control(struct device *dev, struct device_attribute *attr, const char *buf,
                                    size_t count)
 {
         int n;
@@ -518,25 +518,22 @@ static int __init tiocx_init(void)
         return 0;
 }
 
-static void __exit tiocx_exit(void)
+static int cx_remove_device(struct device * dev, void * data)
 {
-        struct device *dev;
-        struct device *tdev;
+        struct cx_dev *cx_dev = to_cx_dev(dev);
+        device_remove_file(dev, &dev_attr_cxdev_control);
+        cx_device_unregister(cx_dev);
+        return 0;
+}
 
+static void __exit tiocx_exit(void)
+{
         DBG("tiocx_exit\n");
 
         /*
          * Unregister devices.
          */
-        list_for_each_entry_safe(dev, tdev, &tiocx_bus_type.devices.list,
-                                 bus_list) {
-                if (dev) {
-                        struct cx_dev *cx_dev = to_cx_dev(dev);
-                        device_remove_file(dev, &dev_attr_cxdev_control);
-                        cx_device_unregister(cx_dev);
-                }
-        }
-
+        bus_for_each_dev(&tiocx_bus_type, NULL, NULL, cx_remove_device);
         bus_unregister(&tiocx_bus_type);
 }
 
diff --git a/arch/ia64/sn/kernel/xpc_partition.c b/arch/ia64/sn/kernel/xpc_partition.c
index 2c3c4a8af553..cd7ed73f0e7a 100644
--- a/arch/ia64/sn/kernel/xpc_partition.c
+++ b/arch/ia64/sn/kernel/xpc_partition.c
@@ -22,6 +22,7 @@
 #include <linux/cache.h>
 #include <linux/mmzone.h>
 #include <linux/nodemask.h>
+#include <asm/uncached.h>
 #include <asm/sn/bte.h>
 #include <asm/sn/intr.h>
 #include <asm/sn/sn_sal.h>
@@ -183,7 +184,7 @@ xpc_rsvd_page_init(void)
          * memory protections are never restricted.
          */
         if ((amos_page = xpc_vars->amos_page) == NULL) {
-                amos_page = (AMO_t *) mspec_kalloc_page(0);
+                amos_page = (AMO_t *) TO_AMO(uncached_alloc_page(0));
                 if (amos_page == NULL) {
                         dev_err(xpc_part, "can't allocate page of AMOs\n");
                         return NULL;
@@ -200,7 +201,8 @@ xpc_rsvd_page_init(void)
                         if (ret != 0) {
                                 dev_err(xpc_part, "can't change memory "
                                         "protections\n");
-                                mspec_kfree_page((unsigned long) amos_page);
+                                uncached_free_page(__IA64_UNCACHED_OFFSET |
+                                                   TO_PHYS((u64) amos_page));
                                 return NULL;
                         }
                 }