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

[Stephen Rothwell]

Hi all,

After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/firmware/efi/efivars.c: In function 'efivar_release':
drivers/firmware/efi/efivars.c:300:2: error: implicit declaration of function 'kfree' [-Werror=implicit-function-declaration]
drivers/firmware/efi/efivars.c: In function 'efivar_create':
drivers/firmware/efi/efivars.c:341:2: error: implicit declaration of function 'kzalloc' [-Werror=implicit-function-declaration]
drivers/firmware/efi/efivars.c:341:12: warning: assignment makes pointer from integer without a cast [enabled by default]
drivers/firmware/efi/efivars.c: In function 'efivar_create_sysfs_entry':
drivers/firmware/efi/efivars.c:420:13: warning: assignment makes pointer from integer without a cast [enabled by default]
drivers/firmware/efi/efivars.c: In function 'create_efivars_bin_attributes':
drivers/firmware/efi/efivars.c:460:7: warning: assignment makes pointer from integer without a cast [enabled by default]
drivers/firmware/efi/efivars.c:470:7: warning: assignment makes pointer from integer without a cast [enabled by default]
drivers/firmware/efi/efivars.c: In function 'efivar_update_sysfs_entries':
drivers/firmware/efi/efivars.c:527:8: warning: assignment makes pointer from integer without a cast [enabled by default]
drivers/firmware/efi/efivars.c: In function 'efivars_sysfs_callback':
drivers/firmware/efi/efivars.c:551:8: warning: assignment makes pointer from integer without a cast [enabled by default]
fs/efivarfs/inode.c: In function 'efivarfs_create':
fs/efivarfs/inode.c:115:2: error: implicit declaration of function 'kzalloc' [-Werror=implicit-function-declaration]
fs/efivarfs/inode.c:115:6: warning: assignment makes pointer from integer without a cast [enabled by default]
fs/efivarfs/inode.c:139:3: error: implicit declaration of function 'kfree' [-Werror=implicit-function-declaration]
fs/efivarfs/file.c: In function 'efivarfs_file_write':
fs/efivarfs/file.c:35:2: error: implicit declaration of function 'kmalloc' [-Werror=implicit-function-declaration]
fs/efivarfs/file.c:35:7: warning: assignment makes pointer from integer without a cast [enabled by default]
fs/efivarfs/file.c:62:2: error: implicit declaration of function 'kfree' [-Werror=implicit-function-declaration]
fs/efivarfs/file.c: In function 'efivarfs_file_read':
fs/efivarfs/file.c:81:7: warning: assignment makes pointer from integer without a cast [enabled by default]
fs/efivarfs/super.c: In function 'efivarfs_callback':
fs/efivarfs/super.c:132:2: error: implicit declaration of function 'kmalloc' [-Werror=implicit-function-declaration]
fs/efivarfs/super.c:132:8: warning: assignment makes pointer from integer without a cast [enabled by default]
fs/efivarfs/super.c:142:7: warning: assignment makes pointer from integer without a cast [enabled by default]
fs/efivarfs/super.c:166:2: error: implicit declaration of function 'kfree' [-Werror=implicit-function-declaration]
drivers/firmware/efi/efi-pstore.c: In function 'efi_pstore_read_func':
drivers/firmware/efi/efi-pstore.c:77:2: error: implicit declaration of function 'kmalloc' [-Werror=implicit-function-declaration]
drivers/firmware/efi/efi-pstore.c:77:16: warning: assignment makes pointer from integer without a cast [enabled by default]
drivers/firmware/efi/efi-pstore.c: In function 'efivars_pstore_init':
drivers/firmware/efi/efi-pstore.c:225:22: warning: assignment makes pointer from integer without a cast [enabled by default]

Probably caused by commits d68772b7c83f ("efivarfs: Move to fs/efivarfs")
and/or a9499fa7cd3f ("efi: split efisubsystem from efivars") interacting
with some header inclusion changes in the rest of today's trees.

See Rule 1 from Documentation/SubmitChecklist.

I have applied the following merge fix patch for today (this won't quite
apply to the tip tree due to the other patch adding linux/magic.h to
fs/efivarfs/super.c, but that could be applied as well):

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 29 Apr 2013 15:34:28 +1000
Subject: [PATCH] efivars: use of kmalloc etc requires the inclusion of slab.h

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/firmware/efi/efivars.c | 1 +
 fs/efivarfs/file.c             | 1 +
 fs/efivarfs/inode.c            | 1 +
 fs/efivarfs/super.c            | 1 +
 drivers/firmware/efi/efi-pstore.c | 1 +
 5 files changed, 5 insertions(+)

diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
index f8f5e5d..66928a3 100644
--- a/drivers/firmware/efi/efivars.c
+++ b/drivers/firmware/efi/efivars.c
@@ -68,6 +68,7 @@
 #include <linux/efi.h>
 #include <linux/module.h>
 #include <linux/ucs2_string.h>
+#include <linux/slab.h>
 
 #define EFIVARS_VERSION "0.08"
 #define EFIVARS_DATE "2004-May-17"
diff --git a/fs/efivarfs/file.c b/fs/efivarfs/file.c
index ede07fc..bfb5315 100644
--- a/fs/efivarfs/file.c
+++ b/fs/efivarfs/file.c
@@ -9,6 +9,7 @@
 
 #include <linux/efi.h>
 #include <linux/fs.h>
+#include <linux/slab.h>
 
 #include "internal.h"
 
diff --git a/fs/efivarfs/inode.c b/fs/efivarfs/inode.c
index 640e289..7e787fb 100644
--- a/fs/efivarfs/inode.c
+++ b/fs/efivarfs/inode.c
@@ -10,6 +10,7 @@
 #include <linux/efi.h>
 #include <linux/fs.h>
 #include <linux/ctype.h>
+#include <linux/slab.h>
 
 #include "internal.h"
 
diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
index 1fa5e6d..94d9192 100644
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@ -12,6 +12,7 @@
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/pagemap.h>
+#include <linux/slab.h>
 #include <linux/magic.h>
 
 #include "internal.h"
diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c
index 221ad1b..0242795 100644
--- a/drivers/firmware/efi/efi-pstore.c
+++ b/drivers/firmware/efi/efi-pstore.c
@@ -2,6 +2,7 @@
 #include <linux/module.h>
 #include <linux/pstore.h>
 #include <linux/ucs2_string.h>
+#include <linux/slab.h>
 
 #define DUMP_NAME_LEN 52
 

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature