Merge branch 'master' into x86/memblock

Conflicts & resolutions:

* arch/x86/xen/setup.c

	dc91c728fd "xen: allow extra memory to be in multiple regions"
	24aa07882b "memblock, x86: Replace memblock_x86_reserve/free..."

	conflicted on xen_add_extra_mem() updates.  The resolution is
	trivial as the latter just want to replace
	memblock_x86_reserve_range() with memblock_reserve().

* drivers/pci/intel-iommu.c

	166e9278a3f "x86/ia64: intel-iommu: move to drivers/iommu/"
	5dfe8660a3d "bootmem: Replace work_with_active_regions() with..."

	conflicted as the former moved the file under drivers/iommu/.
	Resolved by applying the chnages from the latter on the moved
	file.

* mm/Kconfig

	6661672053a "memblock: add NO_BOOTMEM config symbol"
	c378ddd53f9 "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option"

	conflicted trivially.  Both added config options.  Just
	letting both add their own options resolves the conflict.

* mm/memblock.c

	d1f0ece6cdc "mm/memblock.c: small function definition fixes"
	ed7b56a799c "memblock: Remove memblock_memory_can_coalesce()"

	confliected.  The former updates function removed by the
	latter.  Resolution is trivial.

Signed-off-by: Tejun Heo <tj@kernel.org>

1 files changed, 30 insertions, 29 deletions

diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c
index d5d8d555c410..8d0324bac01c 100644
--- a/net/lapb/lapb_iface.c
+++ b/net/lapb/lapb_iface.c
@@ -139,7 +139,8 @@ out:
         return lapb;
 }
 
-int lapb_register(struct net_device *dev, struct lapb_register_struct *callbacks)
+int lapb_register(struct net_device *dev,
+                  const struct lapb_register_struct *callbacks)
 {
         struct lapb_cb *lapb;
         int rc = LAPB_BADTOKEN;
@@ -158,7 +159,7 @@ int lapb_register(struct net_device *dev, struct lapb_register_struct *callbacks
                 goto out;
 
         lapb->dev       = dev;
-        lapb->callbacks = *callbacks;
+        lapb->callbacks = callbacks;
 
         __lapb_insert_cb(lapb);
 
@@ -300,26 +301,26 @@ int lapb_disconnect_request(struct net_device *dev)
                 goto out;
 
         switch (lapb->state) {
-                case LAPB_STATE_0:
-                        rc = LAPB_NOTCONNECTED;
-                        goto out_put;
+        case LAPB_STATE_0:
+                rc = LAPB_NOTCONNECTED;
+                goto out_put;
 
-                case LAPB_STATE_1:
+        case LAPB_STATE_1:
 #if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S1 TX DISC(1)\n", lapb->dev);
+                printk(KERN_DEBUG "lapb: (%p) S1 TX DISC(1)\n", lapb->dev);
 #endif
 #if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev);
+                printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev);
 #endif
-                        lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND);
-                        lapb->state = LAPB_STATE_0;
-                        lapb_start_t1timer(lapb);
-                        rc = LAPB_NOTCONNECTED;
-                        goto out_put;
-
-                case LAPB_STATE_2:
-                        rc = LAPB_OK;
-                        goto out_put;
+                lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND);
+                lapb->state = LAPB_STATE_0;
+                lapb_start_t1timer(lapb);
+                rc = LAPB_NOTCONNECTED;
+                goto out_put;
+
+        case LAPB_STATE_2:
+                rc = LAPB_OK;
+                goto out_put;
         }
 
         lapb_clear_queues(lapb);
@@ -380,32 +381,32 @@ int lapb_data_received(struct net_device *dev, struct sk_buff *skb)
 
 void lapb_connect_confirmation(struct lapb_cb *lapb, int reason)
 {
-        if (lapb->callbacks.connect_confirmation)
-                lapb->callbacks.connect_confirmation(lapb->dev, reason);
+        if (lapb->callbacks->connect_confirmation)
+                lapb->callbacks->connect_confirmation(lapb->dev, reason);
 }
 
 void lapb_connect_indication(struct lapb_cb *lapb, int reason)
 {
-        if (lapb->callbacks.connect_indication)
-                lapb->callbacks.connect_indication(lapb->dev, reason);
+        if (lapb->callbacks->connect_indication)
+                lapb->callbacks->connect_indication(lapb->dev, reason);
 }
 
 void lapb_disconnect_confirmation(struct lapb_cb *lapb, int reason)
 {
-        if (lapb->callbacks.disconnect_confirmation)
-                lapb->callbacks.disconnect_confirmation(lapb->dev, reason);
+        if (lapb->callbacks->disconnect_confirmation)
+                lapb->callbacks->disconnect_confirmation(lapb->dev, reason);
 }
 
 void lapb_disconnect_indication(struct lapb_cb *lapb, int reason)
 {
-        if (lapb->callbacks.disconnect_indication)
-                lapb->callbacks.disconnect_indication(lapb->dev, reason);
+        if (lapb->callbacks->disconnect_indication)
+                lapb->callbacks->disconnect_indication(lapb->dev, reason);
 }
 
 int lapb_data_indication(struct lapb_cb *lapb, struct sk_buff *skb)
 {
-        if (lapb->callbacks.data_indication)
-                return lapb->callbacks.data_indication(lapb->dev, skb);
+        if (lapb->callbacks->data_indication)
+                return lapb->callbacks->data_indication(lapb->dev, skb);
 
         kfree_skb(skb);
         return NET_RX_SUCCESS; /* For now; must be != NET_RX_DROP */
@@ -415,8 +416,8 @@ int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *skb)
 {
         int used = 0;
 
-        if (lapb->callbacks.data_transmit) {
-                lapb->callbacks.data_transmit(lapb->dev, skb);
+        if (lapb->callbacks->data_transmit) {
+                lapb->callbacks->data_transmit(lapb->dev, skb);
                 used = 1;
         }