14 files changed, 105 insertions, 141 deletions

diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild
index ccbe8ae47a61..3b25bd9dca91 100644
--- a/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
@@ -14,3 +14,4 @@ unifdef-y += gcc_intrin.h
 unifdef-y += intrinsics.h
 unifdef-y += perfmon.h
 unifdef-y += ustack.h
+unifdef-y += swab.h
diff --git a/arch/ia64/include/asm/acpi-ext.h b/arch/ia64/include/asm/acpi-ext.h
index 734d137dda6e..7f8362b379eb 100644
--- a/arch/ia64/include/asm/acpi-ext.h
+++ b/arch/ia64/include/asm/acpi-ext.h
@@ -14,7 +14,6 @@
 #define _ASM_IA64_ACPI_EXT_H
 
 #include <linux/types.h>
-#include <acpi/actypes.h>
 
 extern acpi_status hp_acpi_csr_space (acpi_handle, u64 *base, u64 *length);
 
diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
index 50c2b83fd5a0..d37292bd9875 100644
--- a/arch/ia64/include/asm/atomic.h
+++ b/arch/ia64/include/asm/atomic.h
@@ -17,12 +17,6 @@
 #include <asm/intrinsics.h>
 #include <asm/system.h>
 
-/*
- * On IA-64, counter must always be volatile to ensure that that the
- * memory accesses are ordered.
- */
-typedef struct { volatile __s32 counter; } atomic_t;
-typedef struct { volatile __s64 counter; } atomic64_t;
 
 #define ATOMIC_INIT(i)          ((atomic_t) { (i) })
 #define ATOMIC64_INIT(i)        ((atomic64_t) { (i) })
diff --git a/arch/ia64/include/asm/byteorder.h b/arch/ia64/include/asm/byteorder.h
index 69bd41d7c26e..0f84c5cb703d 100644
--- a/arch/ia64/include/asm/byteorder.h
+++ b/arch/ia64/include/asm/byteorder.h
@@ -1,42 +1,7 @@
 #ifndef _ASM_IA64_BYTEORDER_H
 #define _ASM_IA64_BYTEORDER_H
 
-/*
- * Modified 1998, 1999
- *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co.
- */
-
-#include <asm/types.h>
-#include <asm/intrinsics.h>
-#include <linux/compiler.h>
-
-static __inline__ __attribute_const__ __u64
-__ia64_swab64 (__u64 x)
-{
-        __u64 result;
-
-        result = ia64_mux1(x, ia64_mux1_rev);
-        return result;
-}
-
-static __inline__ __attribute_const__ __u32
-__ia64_swab32 (__u32 x)
-{
-        return __ia64_swab64(x) >> 32;
-}
-
-static __inline__ __attribute_const__ __u16
-__ia64_swab16(__u16 x)
-{
-        return __ia64_swab64(x) >> 48;
-}
-
-#define __arch__swab64(x) __ia64_swab64(x)
-#define __arch__swab32(x) __ia64_swab32(x)
-#define __arch__swab16(x) __ia64_swab16(x)
-
-#define __BYTEORDER_HAS_U64__
-
+#include <asm/swab.h>
 #include <linux/byteorder/little_endian.h>
 
 #endif /* _ASM_IA64_BYTEORDER_H */
diff --git a/arch/ia64/include/asm/sn/acpi.h b/arch/ia64/include/asm/sn/acpi.h
index 9ce2801cbd57..fd480db25565 100644
--- a/arch/ia64/include/asm/sn/acpi.h
+++ b/arch/ia64/include/asm/sn/acpi.h
@@ -9,8 +9,6 @@
 #ifndef _ASM_IA64_SN_ACPI_H
 #define _ASM_IA64_SN_ACPI_H
 
-#include "acpi/acglobal.h"
-
 extern int sn_acpi_rev;
 #define SN_ACPI_BASE_SUPPORT()   (sn_acpi_rev >= 0x20101)
 
diff --git a/arch/ia64/include/asm/swab.h b/arch/ia64/include/asm/swab.h
new file mode 100644
index 000000000000..6aa58b699eea
--- /dev/null
+++ b/arch/ia64/include/asm/swab.h
@@ -0,0 +1,34 @@
+#ifndef _ASM_IA64_SWAB_H
+#define _ASM_IA64_SWAB_H
+
+/*
+ * Modified 1998, 1999
+ *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co.
+ */
+
+#include <asm/types.h>
+#include <asm/intrinsics.h>
+#include <linux/compiler.h>
+
+static __inline__ __attribute_const__ __u64 __arch_swab64(__u64 x)
+{
+        __u64 result;
+
+        result = ia64_mux1(x, ia64_mux1_rev);
+        return result;
+}
+#define __arch_swab64 __arch_swab64
+
+static __inline__ __attribute_const__ __u32 __arch_swab32(__u32 x)
+{
+        return __arch_swab64(x) >> 32;
+}
+#define __arch_swab32 __arch_swab32
+
+static __inline__ __attribute_const__ __u16 __arch_swab16(__u16 x)
+{
+        return __arch_swab64(x) >> 48;
+}
+#define __arch_swab16 __arch_swab16
+
+#endif /* _ASM_IA64_SWAB_H */
diff --git a/arch/ia64/include/asm/swiotlb.h b/arch/ia64/include/asm/swiotlb.h
index fb79423834d0..dcbaea7ce128 100644
--- a/arch/ia64/include/asm/swiotlb.h
+++ b/arch/ia64/include/asm/swiotlb.h
@@ -2,44 +2,7 @@
 #define ASM_IA64__SWIOTLB_H
 
 #include <linux/dma-mapping.h>
-
-/* SWIOTLB interface */
-
-extern dma_addr_t swiotlb_map_single(struct device *hwdev, void *ptr,
-                                     size_t size, int dir);
-extern void *swiotlb_alloc_coherent(struct device *hwdev, size_t size,
-                                    dma_addr_t *dma_handle, gfp_t flags);
-extern void swiotlb_unmap_single(struct device *hwdev, dma_addr_t dev_addr,
-                                 size_t size, int dir);
-extern void swiotlb_sync_single_for_cpu(struct device *hwdev,
-                                        dma_addr_t dev_addr,
-                                        size_t size, int dir);
-extern void swiotlb_sync_single_for_device(struct device *hwdev,
-                                           dma_addr_t dev_addr,
-                                           size_t size, int dir);
-extern void swiotlb_sync_single_range_for_cpu(struct device *hwdev,
-                                              dma_addr_t dev_addr,
-                                              unsigned long offset,
-                                              size_t size, int dir);
-extern void swiotlb_sync_single_range_for_device(struct device *hwdev,
-                                                 dma_addr_t dev_addr,
-                                                 unsigned long offset,
-                                                 size_t size, int dir);
-extern void swiotlb_sync_sg_for_cpu(struct device *hwdev,
-                                    struct scatterlist *sg, int nelems,
-                                    int dir);
-extern void swiotlb_sync_sg_for_device(struct device *hwdev,
-                                       struct scatterlist *sg, int nelems,
-                                       int dir);
-extern int swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg,
-                          int nents, int direction);
-extern void swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg,
-                             int nents, int direction);
-extern int swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr);
-extern void swiotlb_free_coherent(struct device *hwdev, size_t size,
-                                  void *vaddr, dma_addr_t dma_handle);
-extern int swiotlb_dma_supported(struct device *hwdev, u64 mask);
-extern void swiotlb_init(void);
+#include <linux/swiotlb.h>
 
 extern int swiotlb_force;
 
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 0553648b7595..d541671caf4a 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -65,6 +65,7 @@ EXPORT_SYMBOL(pm_idle);
 void (*pm_power_off) (void);
 EXPORT_SYMBOL(pm_power_off);
 
+u32 acpi_rsdt_forced;
 unsigned int acpi_cpei_override;
 unsigned int acpi_cpei_phys_cpuid;
 
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index f07688da947c..f90be51b1123 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -434,7 +434,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
         /*
          * It is possible to have multiple instances associated with a given
          * task either because an multiple functions in the call path
-         * have a return probe installed on them, and/or more then one return
+         * have a return probe installed on them, and/or more than one return
          * return probe was registered for a target function.
          *
          * We can handle this because:
@@ -670,9 +670,11 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
 
 void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
-        mutex_lock(&kprobe_mutex);
-        free_insn_slot(p->ainsn.insn, p->ainsn.inst_flag & INST_FLAG_BOOSTABLE);
-        mutex_unlock(&kprobe_mutex);
+        if (p->ainsn.insn) {
+                free_insn_slot(p->ainsn.insn,
+                               p->ainsn.inst_flag & INST_FLAG_BOOSTABLE);
+                p->ainsn.insn = NULL;
+        }
 }
 /*
  * We are resuming execution after a single step fault, so the pt_regs
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
index 2a92f637431d..d0ada067a4af 100644
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
@@ -39,7 +39,7 @@ int iommu_detected __read_mostly;
    be probably a smaller DMA mask, but this is bug-to-bug compatible
    to i386. */
 struct device fallback_dev = {
-        .bus_id = "fallback device",
+        .init_name = "fallback device",
         .coherent_dma_mask = DMA_32BIT_MASK,
         .dma_mask = &fallback_dev.coherent_dma_mask,
 };
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 054bcd9439aa..56e12903973c 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -692,7 +692,7 @@ int arch_add_memory(int nid, u64 start, u64 size)
         pgdat = NODE_DATA(nid);
 
         zone = pgdat->node_zones + ZONE_NORMAL;
-        ret = __add_pages(zone, start_pfn, nr_pages);
+        ret = __add_pages(nid, zone, start_pfn, nr_pages);
 
         if (ret)
                 printk("%s: Problem encountered in __add_pages() as ret=%d\n",
diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c
index bc610a6c7851..c5a214026a77 100644
--- a/arch/ia64/sn/kernel/io_acpi_init.c
+++ b/arch/ia64/sn/kernel/io_acpi_init.c
@@ -13,7 +13,6 @@
 #include <asm/sn/sn_sal.h>
 #include "xtalk/hubdev.h"
 #include <linux/acpi.h>
-#include <acpi/acnamesp.h>
 
 
 /*
@@ -64,6 +63,7 @@ static acpi_status __init
 sn_acpi_hubdev_init(acpi_handle handle, u32 depth, void *context, void **ret)
 {
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         u64 addr;
         struct hubdev_info *hubdev;
         struct hubdev_info *hubdev_ptr;
@@ -77,11 +77,12 @@ sn_acpi_hubdev_init(acpi_handle handle, u32 depth, void *context, void **ret)
         status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,
                                           &sn_uuid, &buffer);
         if (ACPI_FAILURE(status)) {
+                acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);
                 printk(KERN_ERR
                        "sn_acpi_hubdev_init: acpi_get_vendor_resource() "
-                       "(0x%x) failed for: ", status);
-                acpi_ns_print_node_pathname(handle, NULL);
-                printk("\n");
+                       "(0x%x) failed for: %s\n", status,
+                        (char *)name_buffer.pointer);
+                kfree(name_buffer.pointer);
                 return AE_OK;           /* Continue walking namespace */
         }
 
@@ -89,11 +90,12 @@ sn_acpi_hubdev_init(acpi_handle handle, u32 depth, void *context, void **ret)
         vendor = &resource->data.vendor_typed;
         if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=
             sizeof(struct hubdev_info *)) {
+                acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);
                 printk(KERN_ERR
-                       "sn_acpi_hubdev_init: Invalid vendor data length: %d for: ",
-                        vendor->byte_length);
-                acpi_ns_print_node_pathname(handle, NULL);
-                printk("\n");
+                       "sn_acpi_hubdev_init: Invalid vendor data length: "
+                       "%d for: %s\n",
+                        vendor->byte_length, (char *)name_buffer.pointer);
+                kfree(name_buffer.pointer);
                 goto exit;
         }
 
@@ -120,6 +122,7 @@ sn_get_bussoft_ptr(struct pci_bus *bus)
 {
         u64 addr;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         acpi_handle handle;
         struct pcibus_bussoft *prom_bussoft_ptr;
         struct acpi_resource *resource;
@@ -131,11 +134,11 @@ sn_get_bussoft_ptr(struct pci_bus *bus)
         status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,
                                           &sn_uuid, &buffer);
         if (ACPI_FAILURE(status)) {
+                acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);
                 printk(KERN_ERR "%s: "
-                       "acpi_get_vendor_resource() failed (0x%x) for: ",
-                       __func__, status);
-                acpi_ns_print_node_pathname(handle, NULL);
-                printk("\n");
+                       "acpi_get_vendor_resource() failed (0x%x) for: %s\n",
+                       __func__, status, (char *)name_buffer.pointer);
+                kfree(name_buffer.pointer);
                 return NULL;
         }
         resource = buffer.pointer;
@@ -168,6 +171,7 @@ sn_extract_device_info(acpi_handle handle, struct pcidev_info **pcidev_info,
 {
         u64 addr;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         struct sn_irq_info *irq_info, *irq_info_prom;
         struct pcidev_info *pcidev_ptr, *pcidev_prom_ptr;
         struct acpi_resource *resource;
@@ -182,11 +186,11 @@ sn_extract_device_info(acpi_handle handle, struct pcidev_info **pcidev_info,
         status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,
                                           &sn_uuid, &buffer);
         if (ACPI_FAILURE(status)) {
+                acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);
                 printk(KERN_ERR
-                       "%s: acpi_get_vendor_resource() failed (0x%x) for: ",
-                        __func__, status);
-                acpi_ns_print_node_pathname(handle, NULL);
-                printk("\n");
+                       "%s: acpi_get_vendor_resource() failed (0x%x) for: %s\n",
+                        __func__, status, (char *)name_buffer.pointer);
+                kfree(name_buffer.pointer);
                 return 1;
         }
 
@@ -194,11 +198,12 @@ sn_extract_device_info(acpi_handle handle, struct pcidev_info **pcidev_info,
         vendor = &resource->data.vendor_typed;
         if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=
             sizeof(struct pci_devdev_info *)) {
+                acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);
                 printk(KERN_ERR
-                       "%s: Invalid vendor data length: %d for: ",
-                        __func__, vendor->byte_length);
-                acpi_ns_print_node_pathname(handle, NULL);
-                printk("\n");
+                       "%s: Invalid vendor data length: %d for: %s\n",
+                         __func__, vendor->byte_length,
+                        (char *)name_buffer.pointer);
+                kfree(name_buffer.pointer);
                 ret = 1;
                 goto exit;
         }
@@ -239,6 +244,9 @@ get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle)
         acpi_handle parent;
         int slot;
         acpi_status status;
+        struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+
+        acpi_get_name(device_handle, ACPI_FULL_PATHNAME, &name_buffer);
 
         /*
          * Do an upward search to find the root bus device, and
@@ -249,9 +257,8 @@ get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle)
                 status = acpi_get_parent(child, &parent);
                 if (ACPI_FAILURE(status)) {
                         printk(KERN_ERR "%s: acpi_get_parent() failed "
-                               "(0x%x) for: ", __func__, status);
-                        acpi_ns_print_node_pathname(child, NULL);
-                        printk("\n");
+                               "(0x%x) for: %s\n", __func__, status,
+                                (char *)name_buffer.pointer);
                         panic("%s: Unable to find host devfn\n", __func__);
                 }
                 if (parent == rootbus_handle)
@@ -259,22 +266,20 @@ get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle)
                 child = parent;
         }
         if (!child) {
-                printk(KERN_ERR "%s: Unable to find root bus for: ",
-                       __func__);
-                acpi_ns_print_node_pathname(device_handle, NULL);
-                printk("\n");
+                printk(KERN_ERR "%s: Unable to find root bus for: %s\n",
+                       __func__, (char *)name_buffer.pointer);
                 BUG();
         }
 
         status = acpi_evaluate_integer(child, METHOD_NAME__ADR, NULL, &adr);
         if (ACPI_FAILURE(status)) {
-                printk(KERN_ERR "%s: Unable to get _ADR (0x%x) for: ",
-                       __func__, status);
-                acpi_ns_print_node_pathname(child, NULL);
-                printk("\n");
+                printk(KERN_ERR "%s: Unable to get _ADR (0x%x) for: %s\n",
+                       __func__, status, (char *)name_buffer.pointer);
                 panic("%s: Unable to find host devfn\n", __func__);
         }
 
+        kfree(name_buffer.pointer);
+
         slot = (adr >> 16) & 0xffff;
         function = adr & 0xffff;
         devfn = PCI_DEVFN(slot, function);
@@ -300,27 +305,28 @@ find_matching_device(acpi_handle handle, u32 lvl, void *context, void **rv)
         int function;
         int slot;
         struct sn_pcidev_match *info = context;
+        struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
         status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL,
                                        &adr);
         if (ACPI_SUCCESS(status)) {
                 status = acpi_get_parent(handle, &parent);
                 if (ACPI_FAILURE(status)) {
+                        acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);
                         printk(KERN_ERR
-                               "%s: acpi_get_parent() failed (0x%x) for: ",
-                                        __func__, status);
-                        acpi_ns_print_node_pathname(handle, NULL);
-                        printk("\n");
+                               "%s: acpi_get_parent() failed (0x%x) for: %s\n",
+                                __func__, status, (char *)name_buffer.pointer);
+                        kfree(name_buffer.pointer);
                         return AE_OK;
                 }
                 status = acpi_evaluate_integer(parent, METHOD_NAME__BBN,
                                                NULL, &bbn);
                 if (ACPI_FAILURE(status)) {
+                        acpi_get_name(handle, ACPI_FULL_PATHNAME, &name_buffer);
                         printk(KERN_ERR
-                          "%s: Failed to find _BBN in parent of: ",
-                                        __func__);
-                        acpi_ns_print_node_pathname(handle, NULL);
-                        printk("\n");
+                          "%s: Failed to find _BBN in parent of: %s\n",
+                                        __func__, (char *)name_buffer.pointer);
+                        kfree(name_buffer.pointer);
                         return AE_OK;
                 }
 
@@ -350,24 +356,27 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info,
         acpi_handle rootbus_handle;
         unsigned long long segment;
         acpi_status status;
+        struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
         rootbus_handle = PCI_CONTROLLER(dev)->acpi_handle;
         status = acpi_evaluate_integer(rootbus_handle, METHOD_NAME__SEG, NULL,
                                        &segment);
         if (ACPI_SUCCESS(status)) {
                 if (segment != pci_domain_nr(dev)) {
+                        acpi_get_name(rootbus_handle, ACPI_FULL_PATHNAME,
+                                &name_buffer);
                         printk(KERN_ERR
-                               "%s: Segment number mismatch, 0x%llx vs 0x%x for: ",
-                               __func__, segment, pci_domain_nr(dev));
-                        acpi_ns_print_node_pathname(rootbus_handle, NULL);
-                        printk("\n");
+                               "%s: Segment number mismatch, 0x%llx vs 0x%x for: %s\n",
+                               __func__, segment, pci_domain_nr(dev),
+                               (char *)name_buffer.pointer);
+                        kfree(name_buffer.pointer);
                         return 1;
                 }
         } else {
-                printk(KERN_ERR "%s: Unable to get __SEG from: ",
-                       __func__);
-                acpi_ns_print_node_pathname(rootbus_handle, NULL);
-                printk("\n");
+                acpi_get_name(rootbus_handle, ACPI_FULL_PATHNAME, &name_buffer);
+                printk(KERN_ERR "%s: Unable to get __SEG from: %s\n",
+                       __func__, (char *)name_buffer.pointer);
+                kfree(name_buffer.pointer);
                 return 1;
         }
 
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
index 8a924a5661dd..0d4ffa4da1da 100644
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -26,7 +26,6 @@
 #include <linux/acpi.h>
 #include <asm/sn/sn2/sn_hwperf.h>
 #include <asm/sn/acpi.h>
-#include "acpi/acglobal.h"
 
 extern void sn_init_cpei_timer(void);
 extern void register_sn_procfs(void);
@@ -473,7 +472,7 @@ sn_io_early_init(void)
         {
                 struct acpi_table_header *header = NULL;
 
-                acpi_get_table_by_index(ACPI_TABLE_INDEX_DSDT, &header);
+                acpi_get_table(ACPI_SIG_DSDT, 1, &header);
                 BUG_ON(header == NULL);
                 sn_acpi_rev = header->oem_revision;
         }
@@ -505,7 +504,7 @@ sn_io_early_init(void)
 
         {
                 struct acpi_table_header *header;
-                (void)acpi_get_table_by_index(ACPI_TABLE_INDEX_DSDT, &header);
+                (void)acpi_get_table(ACPI_SIG_DSDT, 1, &header);
                 printk(KERN_INFO "ACPI  DSDT OEM Rev 0x%x\n",
                         header->oem_revision);
         }
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index a88eba3314d7..3f864238566d 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -206,8 +206,7 @@ cx_device_register(nasid_t nasid, int part_num, int mfg_num,
         cx_dev->dev.parent = NULL;
         cx_dev->dev.bus = &tiocx_bus_type;
         cx_dev->dev.release = tiocx_bus_release;
-        snprintf(cx_dev->dev.bus_id, BUS_ID_SIZE, "%d",
-                 cx_dev->cx_id.nasid);
+        dev_set_name(&cx_dev->dev, "%d", cx_dev->cx_id.nasid);
         device_register(&cx_dev->dev);
         get_device(&cx_dev->dev);