linux-kernel - Build failure after merge of the char-misc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20131003235419.GG27287@sirena.org.uk>
Date:	Fri, 4 Oct 2013 00:54:19 +0100
From:	Mark Brown <broonie@...nel.org>
To:	Sudeep Dutt <sudeep.dutt@...el.com>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Dasaratharaman Chandramouli 
	<dasaratharaman.chandramouli@...el.com>,
	Ashutosh Dixit <ashutosh.dixit@...el.com>,
	Tejun Heo <tj@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thierry Reding <thierry.reding@...il.com>
Subject: Build failure after merge of the char-misc tree

After merging the char-misc tree into -next an x86 allmodconfig build fails
with:

drivers/misc/mic/host/mic_main.c: In function ‘mic_probe’:
drivers/misc/mic/host/mic_main.c:320:3: error: too many arguments to function ‘sysfs_get_dirent’
   NULL, "state");
   ^
In file included from include/linux/kobject.h:21:0,
                 from include/linux/module.h:16,
                 from drivers/misc/mic/host/mic_main.c:26:
include/linux/sysfs.h:465:1: note: declared here
 sysfs_get_dirent(struct sysfs_dirent *parent_sd, const unsigned char
*name)
 ^
make[4]: *** [drivers/misc/mic/host/mic_main.o] Error 1

caused by an interaction between the addition of the Intel MIC host
driver and commit 388975cccaaf1 (sysfs: clean up sysfs_get_dirent())
from the driver-current tree.

I've applied the patch below and can carry it for the time being.

From abbabb4580f45accf74f95aed6fe35b26ae8d009 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@...aro.org>
Date: Fri, 4 Oct 2013 00:53:01 +0100
Subject: [PATCH] misc: mic: Update for sysfs_get_dirent() cleanups

Signed-off-by: Mark Brown <broonie@...aro.org>
---
 drivers/misc/mic/host/mic_main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/misc/mic/host/mic_main.c b/drivers/misc/mic/host/mic_main.c
index ca06aa9..50c2ea3 100644
--- a/drivers/misc/mic/host/mic_main.c
+++ b/drivers/misc/mic/host/mic_main.c
@@ -316,8 +316,7 @@ static int mic_probe(struct pci_dev *pdev,
 			"device_create_with_groups failed rc %d\n", rc);
 		goto smpt_uninit;
 	}
-	mdev->state_sysfs = sysfs_get_dirent(mdev->sdev->kobj.sd,
-		NULL, "state");
+	mdev->state_sysfs = sysfs_get_dirent(mdev->sdev->kobj.sd, "state");
 	if (!mdev->state_sysfs) {
 		rc = -ENODEV;
 		dev_err(&pdev->dev, "sysfs_get_dirent failed rc %d\n", rc);
-- 
1.8.4.rc3


Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)