linux-next: build failure after merge of the akpm tree

[Stephen Rothwell]

Hi Andrew,

After merging the akpm tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/base/memory.c: In function 'memory_block_change_state':
drivers/base/memory.c:306:22: error: 'struct memory_block' has no member named 'sysdev'
drivers/base/memory.c:309:22: error: 'struct memory_block' has no member named 'sysdev'

Caused by commit 2691cc121386 ("kdump: add udev events for memory
online/offline") interacting with commit 10fbcf4c6cb1 ("convert 'memory'
sysdev_class to a regular subsystem") from the driver-core tree.

I have added the following merge fix patch for today:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 5 Jan 2012 18:25:57 +1100
Subject: [PATCH] memory: fix ups for class to subsystem conversion

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/base/memory.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 3463e87..ed5de58 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -303,10 +303,10 @@ static int memory_block_change_state(struct memory_block *mem,
 	mem->state = to_state;
 	switch (mem->state) {
 	case MEM_OFFLINE:
-		kobject_uevent(&mem->sysdev.kobj, KOBJ_OFFLINE);
+		kobject_uevent(&mem->dev.kobj, KOBJ_OFFLINE);
 		break;
 	case MEM_ONLINE:
-		kobject_uevent(&mem->sysdev.kobj, KOBJ_ONLINE);
+		kobject_uevent(&mem->dev.kobj, KOBJ_ONLINE);
 		break;
 	default:
 		break;
-- 
1.7.8.197.g73c6b

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature