Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[firefly-linux-kernel-4.4.55.git] / arch / sparc64 / kernel / ds.c

diff --git a/arch/sparc64/kernel/ds.c b/arch/sparc64/kernel/ds.c
index bd76482077be66aa3e9e1d6e22d3523a34e4597a..f52e0534d91d060c58445e483928c66099517cc7 100644 (file)
--- a/arch/sparc64/kernel/ds.c
+++ b/arch/sparc64/kernel/ds.c
@@ -1,6 +1,6 @@
 /* ds.c: Domain Services driver for Logical Domains
  *
- * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
+ * Copyright (C) 2007, 2008 David S. Miller <davem@davemloft.net>
  */
 
 #include <linux/kernel.h>
@@ -159,7 +159,7 @@ static void ds_var_data(struct ds_info *dp,
                        struct ds_cap_state *cp,
                        void *buf, int len);
 
-struct ds_cap_state ds_states_template[] = {
+static struct ds_cap_state ds_states_template[] = {
        {
                .service_id     = "md-update",
                .data           = md_update_data,
@@ -972,8 +972,7 @@ static void process_ds_work(void)
        LIST_HEAD(todo);
 
        spin_lock_irqsave(&ds_lock, flags);
-       list_splice(&ds_work_list, &todo);
-       INIT_LIST_HEAD(&ds_work_list);
+       list_splice_init(&ds_work_list, &todo);
        spin_unlock_irqrestore(&ds_lock, flags);
 
        list_for_each_entry_safe(qp, tmp, &todo, list) {
@@ -1218,7 +1217,7 @@ static int ds_remove(struct vio_dev *vdev)
        return 0;
 }
 
-static struct vio_device_id ds_match[] = {
+static struct vio_device_id __initdata ds_match[] = {
        {
                .type = "domain-services-port",
        },