linux-next: manual merge of the driver-core tree with the tip tree

linux-next: manual merge of the driver-core tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1410 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add
udelay_test module to validate udelay") from the tip tree and commit
0a8adf584759 ("test: add firmware_class loader test") from the
driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc lib/Kconfig.debug
index 7cc4e8aff5df,213cd9f7e957..000000000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -1659,15 -1649,19 +1659,28 @@@ config TEST_BP
  
  	  If unsure, say N.
  
+ config TEST_FIRMWARE
+ 	tristate "Test firmware loading via userspace interface"
+ 	default n
+ 	depends on FW_LOADER
+ 	help
+ 	  This builds the "test_firmware" module that creates a userspace
+ 	  interface for testing firmware loading. This can be used to
+ 	  control the triggering of firmware loading without needing an
+ 	  actual firmware-using device. The contents can be rechecked by
+ 	  userspace.
+ 
+ 	  If unsure, say N.
+ 
 +config TEST_UDELAY
 +	tristate "udelay test driver"
 +	default n
 +	help
 +	  This builds the "udelay_test" module that helps to make sure
 +	  that udelay() is working properly.
 +
 +	  If unsure, say N.
 +
  source "samples/Kconfig"
  
  source "lib/Kconfig.kgdb"

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the driver-core tree with the tip tree

[Greg KH]

On Thu, Jul 31, 2014 at 05:07:35PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add
> udelay_test module to validate udelay") from the tip tree and commit
> 0a8adf584759 ("test: add firmware_class loader test") from the
> driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

greg k-h

Re: linux-next: manual merge of the driver-core tree with the tip tree

[Kees Cook]

On Thu, Jul 31, 2014 at 8:20 PM, Greg KH <greg@kroah.com> wrote:
> On Thu, Jul 31, 2014 at 05:07:35PM +1000, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the driver-core tree got a conflict in
>> lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add
>> udelay_test module to validate udelay") from the tip tree and commit
>> 0a8adf584759 ("test: add firmware_class loader test") from the
>> driver-core tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Looks good, thanks.

For keeping things regularized, could this module instead be named
"test_udelay", to match the rest of most of the test modules?
(Starting with "test_".)

-Kees

-- 
Kees Cook
Chrome OS Security

Re: linux-next: manual merge of the driver-core tree with the tip tree

[Greg KH]

On Fri, Aug 01, 2014 at 07:38:26PM -0400, Kees Cook wrote:
> On Thu, Jul 31, 2014 at 8:20 PM, Greg KH <greg@kroah.com> wrote:
> > On Thu, Jul 31, 2014 at 05:07:35PM +1000, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the driver-core tree got a conflict in
> >> lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add
> >> udelay_test module to validate udelay") from the tip tree and commit
> >> 0a8adf584759 ("test: add firmware_class loader test") from the
> >> driver-core tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary (no action
> >> is required).
> >
> > Looks good, thanks.
> 
> For keeping things regularized, could this module instead be named
> "test_udelay", to match the rest of most of the test modules?
> (Starting with "test_".)

Makes sense, want to send a patch to rename it?

thanks,

greg k-h

Re: linux-next: manual merge of the driver-core tree with the tip tree

[John Stultz]

On Fri, Aug 1, 2014 at 4:38 PM, Kees Cook <keescook@chromium.org> wrote:
> On Thu, Jul 31, 2014 at 8:20 PM, Greg KH <greg@kroah.com> wrote:
>> On Thu, Jul 31, 2014 at 05:07:35PM +1000, Stephen Rothwell wrote:
>>> Hi Greg,
>>>
>>> Today's linux-next merge of the driver-core tree got a conflict in
>>> lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add
>>> udelay_test module to validate udelay") from the tip tree and commit
>>> 0a8adf584759 ("test: add firmware_class loader test") from the
>>> driver-core tree.
>>>
>>> I fixed it up (see below) and can carry the fix as necessary (no action
>>> is required).
>>
>> Looks good, thanks.
>
> For keeping things regularized, could this module instead be named
> "test_udelay", to match the rest of most of the test modules?
> (Starting with "test_".)

Sure. I'll spin up a patch to change it and will submit here shortly.

thanks
-john

[PATCH] time: Rename udelay_test.c to test_udelay.c

[John Stultz]

Kees requested that this test module be renamed for consistency sake,
so this patch renames the udelay_test.c file (recently added to
tip/timers/core for 3.17) to test_udelay.c

Cc: Kees Cook <keescook@chromium.org>
Cc: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Linux-Next <linux-next@vger.kernel.org>
Cc: David Riley <davidriley@chromium.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 kernel/time/Makefile      |   2 +-
 kernel/time/test_udelay.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++
 kernel/time/udelay_test.c | 168 ----------------------------------------------
 3 files changed, 169 insertions(+), 169 deletions(-)
 create mode 100644 kernel/time/test_udelay.c
 delete mode 100644 kernel/time/udelay_test.c

diff --git a/kernel/time/Makefile b/kernel/time/Makefile
index 7347426..f622cf2 100644
--- a/kernel/time/Makefile
+++ b/kernel/time/Makefile
@@ -13,7 +13,7 @@ obj-$(CONFIG_TICK_ONESHOT)			+= tick-oneshot.o
 obj-$(CONFIG_TICK_ONESHOT)			+= tick-sched.o
 obj-$(CONFIG_TIMER_STATS)			+= timer_stats.o
 obj-$(CONFIG_DEBUG_FS)				+= timekeeping_debug.o
-obj-$(CONFIG_TEST_UDELAY)			+= udelay_test.o
+obj-$(CONFIG_TEST_UDELAY)			+= test_udelay.o
 
 $(obj)/time.o: $(obj)/timeconst.h
 
diff --git a/kernel/time/test_udelay.c b/kernel/time/test_udelay.c
new file mode 100644
index 0000000..e622ba3
--- /dev/null
+++ b/kernel/time/test_udelay.c
@@ -0,0 +1,168 @@
+/*
+ * udelay() test kernel module
+ *
+ * Test is executed by writing and reading to /sys/kernel/debug/udelay_test
+ * Tests are configured by writing: USECS ITERATIONS
+ * Tests are executed by reading from the same file.
+ * Specifying usecs of 0 or negative values will run multiples tests.
+ *
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/debugfs.h>
+#include <linux/delay.h>
+#include <linux/ktime.h>
+#include <linux/module.h>
+#include <linux/uaccess.h>
+
+#define DEFAULT_ITERATIONS 100
+
+#define DEBUGFS_FILENAME "udelay_test"
+
+static DEFINE_MUTEX(udelay_test_lock);
+static struct dentry *udelay_test_debugfs_file;
+static int udelay_test_usecs;
+static int udelay_test_iterations = DEFAULT_ITERATIONS;
+
+static int udelay_test_single(struct seq_file *s, int usecs, uint32_t iters)
+{
+	int min = 0, max = 0, fail_count = 0;
+	uint64_t sum = 0;
+	uint64_t avg;
+	int i;
+	/* Allow udelay to be up to 0.5% fast */
+	int allowed_error_ns = usecs * 5;
+
+	for (i = 0; i < iters; ++i) {
+		struct timespec ts1, ts2;
+		int time_passed;
+
+		ktime_get_ts(&ts1);
+		udelay(usecs);
+		ktime_get_ts(&ts2);
+		time_passed = timespec_to_ns(&ts2) - timespec_to_ns(&ts1);
+
+		if (i == 0 || time_passed < min)
+			min = time_passed;
+		if (i == 0 || time_passed > max)
+			max = time_passed;
+		if ((time_passed + allowed_error_ns) / 1000 < usecs)
+			++fail_count;
+		WARN_ON(time_passed < 0);
+		sum += time_passed;
+	}
+
+	avg = sum;
+	do_div(avg, iters);
+	seq_printf(s, "%d usecs x %d: exp=%d allowed=%d min=%d avg=%lld max=%d",
+			usecs, iters, usecs * 1000,
+			(usecs * 1000) - allowed_error_ns, min, avg, max);
+	if (fail_count)
+		seq_printf(s, " FAIL=%d", fail_count);
+	seq_puts(s, "\n");
+
+	return 0;
+}
+
+static int udelay_test_show(struct seq_file *s, void *v)
+{
+	int usecs;
+	int iters;
+	int ret = 0;
+
+	mutex_lock(&udelay_test_lock);
+	usecs = udelay_test_usecs;
+	iters = udelay_test_iterations;
+	mutex_unlock(&udelay_test_lock);
+
+	if (usecs > 0 && iters > 0) {
+		return udelay_test_single(s, usecs, iters);
+	} else if (usecs == 0) {
+		struct timespec ts;
+
+		ktime_get_ts(&ts);
+		seq_printf(s, "udelay() test (lpj=%ld kt=%ld.%09ld)\n",
+				loops_per_jiffy, ts.tv_sec, ts.tv_nsec);
+		seq_puts(s, "usage:\n");
+		seq_puts(s, "echo USECS [ITERS] > " DEBUGFS_FILENAME "\n");
+		seq_puts(s, "cat " DEBUGFS_FILENAME "\n");
+	}
+
+	return ret;
+}
+
+static int udelay_test_open(struct inode *inode, struct file *file)
+{
+	return single_open(file, udelay_test_show, inode->i_private);
+}
+
+static ssize_t udelay_test_write(struct file *file, const char __user *buf,
+		size_t count, loff_t *pos)
+{
+	char lbuf[32];
+	int ret;
+	int usecs;
+	int iters;
+
+	if (count >= sizeof(lbuf))
+		return -EINVAL;
+
+	if (copy_from_user(lbuf, buf, count))
+		return -EFAULT;
+	lbuf[count] = '\0';
+
+	ret = sscanf(lbuf, "%d %d", &usecs, &iters);
+	if (ret < 1)
+		return -EINVAL;
+	else if (ret < 2)
+		iters = DEFAULT_ITERATIONS;
+
+	mutex_lock(&udelay_test_lock);
+	udelay_test_usecs = usecs;
+	udelay_test_iterations = iters;
+	mutex_unlock(&udelay_test_lock);
+
+	return count;
+}
+
+static const struct file_operations udelay_test_debugfs_ops = {
+	.owner = THIS_MODULE,
+	.open = udelay_test_open,
+	.read = seq_read,
+	.write = udelay_test_write,
+	.llseek = seq_lseek,
+	.release = single_release,
+};
+
+static int __init udelay_test_init(void)
+{
+	mutex_lock(&udelay_test_lock);
+	udelay_test_debugfs_file = debugfs_create_file(DEBUGFS_FILENAME,
+			S_IRUSR, NULL, NULL, &udelay_test_debugfs_ops);
+	mutex_unlock(&udelay_test_lock);
+
+	return 0;
+}
+
+module_init(udelay_test_init);
+
+static void __exit udelay_test_exit(void)
+{
+	mutex_lock(&udelay_test_lock);
+	debugfs_remove(udelay_test_debugfs_file);
+	mutex_unlock(&udelay_test_lock);
+}
+
+module_exit(udelay_test_exit);
+
+MODULE_AUTHOR("David Riley <davidriley@chromium.org>");
+MODULE_LICENSE("GPL");
diff --git a/kernel/time/udelay_test.c b/kernel/time/udelay_test.c
deleted file mode 100644
index e622ba3..0000000
--- a/kernel/time/udelay_test.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * udelay() test kernel module
- *
- * Test is executed by writing and reading to /sys/kernel/debug/udelay_test
- * Tests are configured by writing: USECS ITERATIONS
- * Tests are executed by reading from the same file.
- * Specifying usecs of 0 or negative values will run multiples tests.
- *
- * Copyright (C) 2014 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/debugfs.h>
-#include <linux/delay.h>
-#include <linux/ktime.h>
-#include <linux/module.h>
-#include <linux/uaccess.h>
-
-#define DEFAULT_ITERATIONS 100
-
-#define DEBUGFS_FILENAME "udelay_test"
-
-static DEFINE_MUTEX(udelay_test_lock);
-static struct dentry *udelay_test_debugfs_file;
-static int udelay_test_usecs;
-static int udelay_test_iterations = DEFAULT_ITERATIONS;
-
-static int udelay_test_single(struct seq_file *s, int usecs, uint32_t iters)
-{
-	int min = 0, max = 0, fail_count = 0;
-	uint64_t sum = 0;
-	uint64_t avg;
-	int i;
-	/* Allow udelay to be up to 0.5% fast */
-	int allowed_error_ns = usecs * 5;
-
-	for (i = 0; i < iters; ++i) {
-		struct timespec ts1, ts2;
-		int time_passed;
-
-		ktime_get_ts(&ts1);
-		udelay(usecs);
-		ktime_get_ts(&ts2);
-		time_passed = timespec_to_ns(&ts2) - timespec_to_ns(&ts1);
-
-		if (i == 0 || time_passed < min)
-			min = time_passed;
-		if (i == 0 || time_passed > max)
-			max = time_passed;
-		if ((time_passed + allowed_error_ns) / 1000 < usecs)
-			++fail_count;
-		WARN_ON(time_passed < 0);
-		sum += time_passed;
-	}
-
-	avg = sum;
-	do_div(avg, iters);
-	seq_printf(s, "%d usecs x %d: exp=%d allowed=%d min=%d avg=%lld max=%d",
-			usecs, iters, usecs * 1000,
-			(usecs * 1000) - allowed_error_ns, min, avg, max);
-	if (fail_count)
-		seq_printf(s, " FAIL=%d", fail_count);
-	seq_puts(s, "\n");
-
-	return 0;
-}
-
-static int udelay_test_show(struct seq_file *s, void *v)
-{
-	int usecs;
-	int iters;
-	int ret = 0;
-
-	mutex_lock(&udelay_test_lock);
-	usecs = udelay_test_usecs;
-	iters = udelay_test_iterations;
-	mutex_unlock(&udelay_test_lock);
-
-	if (usecs > 0 && iters > 0) {
-		return udelay_test_single(s, usecs, iters);
-	} else if (usecs == 0) {
-		struct timespec ts;
-
-		ktime_get_ts(&ts);
-		seq_printf(s, "udelay() test (lpj=%ld kt=%ld.%09ld)\n",
-				loops_per_jiffy, ts.tv_sec, ts.tv_nsec);
-		seq_puts(s, "usage:\n");
-		seq_puts(s, "echo USECS [ITERS] > " DEBUGFS_FILENAME "\n");
-		seq_puts(s, "cat " DEBUGFS_FILENAME "\n");
-	}
-
-	return ret;
-}
-
-static int udelay_test_open(struct inode *inode, struct file *file)
-{
-	return single_open(file, udelay_test_show, inode->i_private);
-}
-
-static ssize_t udelay_test_write(struct file *file, const char __user *buf,
-		size_t count, loff_t *pos)
-{
-	char lbuf[32];
-	int ret;
-	int usecs;
-	int iters;
-
-	if (count >= sizeof(lbuf))
-		return -EINVAL;
-
-	if (copy_from_user(lbuf, buf, count))
-		return -EFAULT;
-	lbuf[count] = '\0';
-
-	ret = sscanf(lbuf, "%d %d", &usecs, &iters);
-	if (ret < 1)
-		return -EINVAL;
-	else if (ret < 2)
-		iters = DEFAULT_ITERATIONS;
-
-	mutex_lock(&udelay_test_lock);
-	udelay_test_usecs = usecs;
-	udelay_test_iterations = iters;
-	mutex_unlock(&udelay_test_lock);
-
-	return count;
-}
-
-static const struct file_operations udelay_test_debugfs_ops = {
-	.owner = THIS_MODULE,
-	.open = udelay_test_open,
-	.read = seq_read,
-	.write = udelay_test_write,
-	.llseek = seq_lseek,
-	.release = single_release,
-};
-
-static int __init udelay_test_init(void)
-{
-	mutex_lock(&udelay_test_lock);
-	udelay_test_debugfs_file = debugfs_create_file(DEBUGFS_FILENAME,
-			S_IRUSR, NULL, NULL, &udelay_test_debugfs_ops);
-	mutex_unlock(&udelay_test_lock);
-
-	return 0;
-}
-
-module_init(udelay_test_init);
-
-static void __exit udelay_test_exit(void)
-{
-	mutex_lock(&udelay_test_lock);
-	debugfs_remove(udelay_test_debugfs_file);
-	mutex_unlock(&udelay_test_lock);
-}
-
-module_exit(udelay_test_exit);
-
-MODULE_AUTHOR("David Riley <davidriley@chromium.org>");
-MODULE_LICENSE("GPL");
-- 
1.9.1

Re: [PATCH] time: Rename udelay_test.c to test_udelay.c

[Kees Cook]

On Mon, Aug 4, 2014 at 11:35 AM, John Stultz <john.stultz@linaro.org> wrote:
> Kees requested that this test module be renamed for consistency sake,
> so this patch renames the udelay_test.c file (recently added to
> tip/timers/core for 3.17) to test_udelay.c
>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Greg KH <greg@kroah.com>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@elte.hu>
> Cc: Linux-Next <linux-next@vger.kernel.org>
> Cc: David Riley <davidriley@chromium.org>
> Signed-off-by: John Stultz <john.stultz@linaro.org>

Thank you! :)

Acked-by: Kees Cook <keescook@chromium.org>

-Kees

> ---
>  kernel/time/Makefile      |   2 +-
>  kernel/time/test_udelay.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++
>  kernel/time/udelay_test.c | 168 ----------------------------------------------
>  3 files changed, 169 insertions(+), 169 deletions(-)
>  create mode 100644 kernel/time/test_udelay.c
>  delete mode 100644 kernel/time/udelay_test.c
>
> diff --git a/kernel/time/Makefile b/kernel/time/Makefile
> index 7347426..f622cf2 100644
> --- a/kernel/time/Makefile
> +++ b/kernel/time/Makefile
> @@ -13,7 +13,7 @@ obj-$(CONFIG_TICK_ONESHOT)                    += tick-oneshot.o
>  obj-$(CONFIG_TICK_ONESHOT)                     += tick-sched.o
>  obj-$(CONFIG_TIMER_STATS)                      += timer_stats.o
>  obj-$(CONFIG_DEBUG_FS)                         += timekeeping_debug.o
> -obj-$(CONFIG_TEST_UDELAY)                      += udelay_test.o
> +obj-$(CONFIG_TEST_UDELAY)                      += test_udelay.o
>
>  $(obj)/time.o: $(obj)/timeconst.h
>
> diff --git a/kernel/time/test_udelay.c b/kernel/time/test_udelay.c
> new file mode 100644
> index 0000000..e622ba3
> --- /dev/null
> +++ b/kernel/time/test_udelay.c
> @@ -0,0 +1,168 @@
> +/*
> + * udelay() test kernel module
> + *
> + * Test is executed by writing and reading to /sys/kernel/debug/udelay_test
> + * Tests are configured by writing: USECS ITERATIONS
> + * Tests are executed by reading from the same file.
> + * Specifying usecs of 0 or negative values will run multiples tests.
> + *
> + * Copyright (C) 2014 Google, Inc.
> + *
> + * This software is licensed under the terms of the GNU General Public
> + * License version 2, as published by the Free Software Foundation, and
> + * may be copied, distributed, and modified under those terms.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/debugfs.h>
> +#include <linux/delay.h>
> +#include <linux/ktime.h>
> +#include <linux/module.h>
> +#include <linux/uaccess.h>
> +
> +#define DEFAULT_ITERATIONS 100
> +
> +#define DEBUGFS_FILENAME "udelay_test"
> +
> +static DEFINE_MUTEX(udelay_test_lock);
> +static struct dentry *udelay_test_debugfs_file;
> +static int udelay_test_usecs;
> +static int udelay_test_iterations = DEFAULT_ITERATIONS;
> +
> +static int udelay_test_single(struct seq_file *s, int usecs, uint32_t iters)
> +{
> +       int min = 0, max = 0, fail_count = 0;
> +       uint64_t sum = 0;
> +       uint64_t avg;
> +       int i;
> +       /* Allow udelay to be up to 0.5% fast */
> +       int allowed_error_ns = usecs * 5;
> +
> +       for (i = 0; i < iters; ++i) {
> +               struct timespec ts1, ts2;
> +               int time_passed;
> +
> +               ktime_get_ts(&ts1);
> +               udelay(usecs);
> +               ktime_get_ts(&ts2);
> +               time_passed = timespec_to_ns(&ts2) - timespec_to_ns(&ts1);
> +
> +               if (i == 0 || time_passed < min)
> +                       min = time_passed;
> +               if (i == 0 || time_passed > max)
> +                       max = time_passed;
> +               if ((time_passed + allowed_error_ns) / 1000 < usecs)
> +                       ++fail_count;
> +               WARN_ON(time_passed < 0);
> +               sum += time_passed;
> +       }
> +
> +       avg = sum;
> +       do_div(avg, iters);
> +       seq_printf(s, "%d usecs x %d: exp=%d allowed=%d min=%d avg=%lld max=%d",
> +                       usecs, iters, usecs * 1000,
> +                       (usecs * 1000) - allowed_error_ns, min, avg, max);
> +       if (fail_count)
> +               seq_printf(s, " FAIL=%d", fail_count);
> +       seq_puts(s, "\n");
> +
> +       return 0;
> +}
> +
> +static int udelay_test_show(struct seq_file *s, void *v)
> +{
> +       int usecs;
> +       int iters;
> +       int ret = 0;
> +
> +       mutex_lock(&udelay_test_lock);
> +       usecs = udelay_test_usecs;
> +       iters = udelay_test_iterations;
> +       mutex_unlock(&udelay_test_lock);
> +
> +       if (usecs > 0 && iters > 0) {
> +               return udelay_test_single(s, usecs, iters);
> +       } else if (usecs == 0) {
> +               struct timespec ts;
> +
> +               ktime_get_ts(&ts);
> +               seq_printf(s, "udelay() test (lpj=%ld kt=%ld.%09ld)\n",
> +                               loops_per_jiffy, ts.tv_sec, ts.tv_nsec);
> +               seq_puts(s, "usage:\n");
> +               seq_puts(s, "echo USECS [ITERS] > " DEBUGFS_FILENAME "\n");
> +               seq_puts(s, "cat " DEBUGFS_FILENAME "\n");
> +       }
> +
> +       return ret;
> +}
> +
> +static int udelay_test_open(struct inode *inode, struct file *file)
> +{
> +       return single_open(file, udelay_test_show, inode->i_private);
> +}
> +
> +static ssize_t udelay_test_write(struct file *file, const char __user *buf,
> +               size_t count, loff_t *pos)
> +{
> +       char lbuf[32];
> +       int ret;
> +       int usecs;
> +       int iters;
> +
> +       if (count >= sizeof(lbuf))
> +               return -EINVAL;
> +
> +       if (copy_from_user(lbuf, buf, count))
> +               return -EFAULT;
> +       lbuf[count] = '\0';
> +
> +       ret = sscanf(lbuf, "%d %d", &usecs, &iters);
> +       if (ret < 1)
> +               return -EINVAL;
> +       else if (ret < 2)
> +               iters = DEFAULT_ITERATIONS;
> +
> +       mutex_lock(&udelay_test_lock);
> +       udelay_test_usecs = usecs;
> +       udelay_test_iterations = iters;
> +       mutex_unlock(&udelay_test_lock);
> +
> +       return count;
> +}
> +
> +static const struct file_operations udelay_test_debugfs_ops = {
> +       .owner = THIS_MODULE,
> +       .open = udelay_test_open,
> +       .read = seq_read,
> +       .write = udelay_test_write,
> +       .llseek = seq_lseek,
> +       .release = single_release,
> +};
> +
> +static int __init udelay_test_init(void)
> +{
> +       mutex_lock(&udelay_test_lock);
> +       udelay_test_debugfs_file = debugfs_create_file(DEBUGFS_FILENAME,
> +                       S_IRUSR, NULL, NULL, &udelay_test_debugfs_ops);
> +       mutex_unlock(&udelay_test_lock);
> +
> +       return 0;
> +}
> +
> +module_init(udelay_test_init);
> +
> +static void __exit udelay_test_exit(void)
> +{
> +       mutex_lock(&udelay_test_lock);
> +       debugfs_remove(udelay_test_debugfs_file);
> +       mutex_unlock(&udelay_test_lock);
> +}
> +
> +module_exit(udelay_test_exit);
> +
> +MODULE_AUTHOR("David Riley <davidriley@chromium.org>");
> +MODULE_LICENSE("GPL");
> diff --git a/kernel/time/udelay_test.c b/kernel/time/udelay_test.c
> deleted file mode 100644
> index e622ba3..0000000
> --- a/kernel/time/udelay_test.c
> +++ /dev/null
> @@ -1,168 +0,0 @@
> -/*
> - * udelay() test kernel module
> - *
> - * Test is executed by writing and reading to /sys/kernel/debug/udelay_test
> - * Tests are configured by writing: USECS ITERATIONS
> - * Tests are executed by reading from the same file.
> - * Specifying usecs of 0 or negative values will run multiples tests.
> - *
> - * Copyright (C) 2014 Google, Inc.
> - *
> - * This software is licensed under the terms of the GNU General Public
> - * License version 2, as published by the Free Software Foundation, and
> - * may be copied, distributed, and modified under those terms.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - */
> -
> -#include <linux/debugfs.h>
> -#include <linux/delay.h>
> -#include <linux/ktime.h>
> -#include <linux/module.h>
> -#include <linux/uaccess.h>
> -
> -#define DEFAULT_ITERATIONS 100
> -
> -#define DEBUGFS_FILENAME "udelay_test"
> -
> -static DEFINE_MUTEX(udelay_test_lock);
> -static struct dentry *udelay_test_debugfs_file;
> -static int udelay_test_usecs;
> -static int udelay_test_iterations = DEFAULT_ITERATIONS;
> -
> -static int udelay_test_single(struct seq_file *s, int usecs, uint32_t iters)
> -{
> -       int min = 0, max = 0, fail_count = 0;
> -       uint64_t sum = 0;
> -       uint64_t avg;
> -       int i;
> -       /* Allow udelay to be up to 0.5% fast */
> -       int allowed_error_ns = usecs * 5;
> -
> -       for (i = 0; i < iters; ++i) {
> -               struct timespec ts1, ts2;
> -               int time_passed;
> -
> -               ktime_get_ts(&ts1);
> -               udelay(usecs);
> -               ktime_get_ts(&ts2);
> -               time_passed = timespec_to_ns(&ts2) - timespec_to_ns(&ts1);
> -
> -               if (i == 0 || time_passed < min)
> -                       min = time_passed;
> -               if (i == 0 || time_passed > max)
> -                       max = time_passed;
> -               if ((time_passed + allowed_error_ns) / 1000 < usecs)
> -                       ++fail_count;
> -               WARN_ON(time_passed < 0);
> -               sum += time_passed;
> -       }
> -
> -       avg = sum;
> -       do_div(avg, iters);
> -       seq_printf(s, "%d usecs x %d: exp=%d allowed=%d min=%d avg=%lld max=%d",
> -                       usecs, iters, usecs * 1000,
> -                       (usecs * 1000) - allowed_error_ns, min, avg, max);
> -       if (fail_count)
> -               seq_printf(s, " FAIL=%d", fail_count);
> -       seq_puts(s, "\n");
> -
> -       return 0;
> -}
> -
> -static int udelay_test_show(struct seq_file *s, void *v)
> -{
> -       int usecs;
> -       int iters;
> -       int ret = 0;
> -
> -       mutex_lock(&udelay_test_lock);
> -       usecs = udelay_test_usecs;
> -       iters = udelay_test_iterations;
> -       mutex_unlock(&udelay_test_lock);
> -
> -       if (usecs > 0 && iters > 0) {
> -               return udelay_test_single(s, usecs, iters);
> -       } else if (usecs == 0) {
> -               struct timespec ts;
> -
> -               ktime_get_ts(&ts);
> -               seq_printf(s, "udelay() test (lpj=%ld kt=%ld.%09ld)\n",
> -                               loops_per_jiffy, ts.tv_sec, ts.tv_nsec);
> -               seq_puts(s, "usage:\n");
> -               seq_puts(s, "echo USECS [ITERS] > " DEBUGFS_FILENAME "\n");
> -               seq_puts(s, "cat " DEBUGFS_FILENAME "\n");
> -       }
> -
> -       return ret;
> -}
> -
> -static int udelay_test_open(struct inode *inode, struct file *file)
> -{
> -       return single_open(file, udelay_test_show, inode->i_private);
> -}
> -
> -static ssize_t udelay_test_write(struct file *file, const char __user *buf,
> -               size_t count, loff_t *pos)
> -{
> -       char lbuf[32];
> -       int ret;
> -       int usecs;
> -       int iters;
> -
> -       if (count >= sizeof(lbuf))
> -               return -EINVAL;
> -
> -       if (copy_from_user(lbuf, buf, count))
> -               return -EFAULT;
> -       lbuf[count] = '\0';
> -
> -       ret = sscanf(lbuf, "%d %d", &usecs, &iters);
> -       if (ret < 1)
> -               return -EINVAL;
> -       else if (ret < 2)
> -               iters = DEFAULT_ITERATIONS;
> -
> -       mutex_lock(&udelay_test_lock);
> -       udelay_test_usecs = usecs;
> -       udelay_test_iterations = iters;
> -       mutex_unlock(&udelay_test_lock);
> -
> -       return count;
> -}
> -
> -static const struct file_operations udelay_test_debugfs_ops = {
> -       .owner = THIS_MODULE,
> -       .open = udelay_test_open,
> -       .read = seq_read,
> -       .write = udelay_test_write,
> -       .llseek = seq_lseek,
> -       .release = single_release,
> -};
> -
> -static int __init udelay_test_init(void)
> -{
> -       mutex_lock(&udelay_test_lock);
> -       udelay_test_debugfs_file = debugfs_create_file(DEBUGFS_FILENAME,
> -                       S_IRUSR, NULL, NULL, &udelay_test_debugfs_ops);
> -       mutex_unlock(&udelay_test_lock);
> -
> -       return 0;
> -}
> -
> -module_init(udelay_test_init);
> -
> -static void __exit udelay_test_exit(void)
> -{
> -       mutex_lock(&udelay_test_lock);
> -       debugfs_remove(udelay_test_debugfs_file);
> -       mutex_unlock(&udelay_test_lock);
> -}
> -
> -module_exit(udelay_test_exit);
> -
> -MODULE_AUTHOR("David Riley <davidriley@chromium.org>");
> -MODULE_LICENSE("GPL");
> --
> 1.9.1
>



-- 
Kees Cook
Chrome OS Security

Re: [PATCH] time: Rename udelay_test.c to test_udelay.c

[David Riley]

On Mon, Aug 4, 2014 at 11:35 AM, John Stultz <john.stultz@linaro.org> wrote:
> Kees requested that this test module be renamed for consistency sake,
> so this patch renames the udelay_test.c file (recently added to
> tip/timers/core for 3.17) to test_udelay.c
>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Greg KH <greg@kroah.com>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@elte.hu>
> Cc: Linux-Next <linux-next@vger.kernel.org>
> Cc: David Riley <davidriley@chromium.org>
> Signed-off-by: John Stultz <john.stultz@linaro.org>

Acked-by: David Riley <davidriley@chromium.org>

> ---
>  kernel/time/Makefile      |   2 +-
>  kernel/time/test_udelay.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++
>  kernel/time/udelay_test.c | 168 ----------------------------------------------
>  3 files changed, 169 insertions(+), 169 deletions(-)
>  create mode 100644 kernel/time/test_udelay.c
>  delete mode 100644 kernel/time/udelay_test.c
>
> diff --git a/kernel/time/Makefile b/kernel/time/Makefile
> index 7347426..f622cf2 100644
> --- a/kernel/time/Makefile
> +++ b/kernel/time/Makefile
> @@ -13,7 +13,7 @@ obj-$(CONFIG_TICK_ONESHOT)                    += tick-oneshot.o
>  obj-$(CONFIG_TICK_ONESHOT)                     += tick-sched.o
>  obj-$(CONFIG_TIMER_STATS)                      += timer_stats.o
>  obj-$(CONFIG_DEBUG_FS)                         += timekeeping_debug.o
> -obj-$(CONFIG_TEST_UDELAY)                      += udelay_test.o
> +obj-$(CONFIG_TEST_UDELAY)                      += test_udelay.o
>
>  $(obj)/time.o: $(obj)/timeconst.h
>
> diff --git a/kernel/time/test_udelay.c b/kernel/time/test_udelay.c
> new file mode 100644
> index 0000000..e622ba3
> --- /dev/null
> +++ b/kernel/time/test_udelay.c
> @@ -0,0 +1,168 @@
> +/*
> + * udelay() test kernel module
> + *
> + * Test is executed by writing and reading to /sys/kernel/debug/udelay_test
> + * Tests are configured by writing: USECS ITERATIONS
> + * Tests are executed by reading from the same file.
> + * Specifying usecs of 0 or negative values will run multiples tests.
> + *
> + * Copyright (C) 2014 Google, Inc.
> + *
> + * This software is licensed under the terms of the GNU General Public
> + * License version 2, as published by the Free Software Foundation, and
> + * may be copied, distributed, and modified under those terms.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/debugfs.h>
> +#include <linux/delay.h>
> +#include <linux/ktime.h>
> +#include <linux/module.h>
> +#include <linux/uaccess.h>
> +
> +#define DEFAULT_ITERATIONS 100
> +
> +#define DEBUGFS_FILENAME "udelay_test"
> +
> +static DEFINE_MUTEX(udelay_test_lock);
> +static struct dentry *udelay_test_debugfs_file;
> +static int udelay_test_usecs;
> +static int udelay_test_iterations = DEFAULT_ITERATIONS;
> +
> +static int udelay_test_single(struct seq_file *s, int usecs, uint32_t iters)
> +{
> +       int min = 0, max = 0, fail_count = 0;
> +       uint64_t sum = 0;
> +       uint64_t avg;
> +       int i;
> +       /* Allow udelay to be up to 0.5% fast */
> +       int allowed_error_ns = usecs * 5;
> +
> +       for (i = 0; i < iters; ++i) {
> +               struct timespec ts1, ts2;
> +               int time_passed;
> +
> +               ktime_get_ts(&ts1);
> +               udelay(usecs);
> +               ktime_get_ts(&ts2);
> +               time_passed = timespec_to_ns(&ts2) - timespec_to_ns(&ts1);
> +
> +               if (i == 0 || time_passed < min)
> +                       min = time_passed;
> +               if (i == 0 || time_passed > max)
> +                       max = time_passed;
> +               if ((time_passed + allowed_error_ns) / 1000 < usecs)
> +                       ++fail_count;
> +               WARN_ON(time_passed < 0);
> +               sum += time_passed;
> +       }
> +
> +       avg = sum;
> +       do_div(avg, iters);
> +       seq_printf(s, "%d usecs x %d: exp=%d allowed=%d min=%d avg=%lld max=%d",
> +                       usecs, iters, usecs * 1000,
> +                       (usecs * 1000) - allowed_error_ns, min, avg, max);
> +       if (fail_count)
> +               seq_printf(s, " FAIL=%d", fail_count);
> +       seq_puts(s, "\n");
> +
> +       return 0;
> +}
> +
> +static int udelay_test_show(struct seq_file *s, void *v)
> +{
> +       int usecs;
> +       int iters;
> +       int ret = 0;
> +
> +       mutex_lock(&udelay_test_lock);
> +       usecs = udelay_test_usecs;
> +       iters = udelay_test_iterations;
> +       mutex_unlock(&udelay_test_lock);
> +
> +       if (usecs > 0 && iters > 0) {
> +               return udelay_test_single(s, usecs, iters);
> +       } else if (usecs == 0) {
> +               struct timespec ts;
> +
> +               ktime_get_ts(&ts);
> +               seq_printf(s, "udelay() test (lpj=%ld kt=%ld.%09ld)\n",
> +                               loops_per_jiffy, ts.tv_sec, ts.tv_nsec);
> +               seq_puts(s, "usage:\n");
> +               seq_puts(s, "echo USECS [ITERS] > " DEBUGFS_FILENAME "\n");
> +               seq_puts(s, "cat " DEBUGFS_FILENAME "\n");
> +       }
> +
> +       return ret;
> +}
> +
> +static int udelay_test_open(struct inode *inode, struct file *file)
> +{
> +       return single_open(file, udelay_test_show, inode->i_private);
> +}
> +
> +static ssize_t udelay_test_write(struct file *file, const char __user *buf,
> +               size_t count, loff_t *pos)
> +{
> +       char lbuf[32];
> +       int ret;
> +       int usecs;
> +       int iters;
> +
> +       if (count >= sizeof(lbuf))
> +               return -EINVAL;
> +
> +       if (copy_from_user(lbuf, buf, count))
> +               return -EFAULT;
> +       lbuf[count] = '\0';
> +
> +       ret = sscanf(lbuf, "%d %d", &usecs, &iters);
> +       if (ret < 1)
> +               return -EINVAL;
> +       else if (ret < 2)
> +               iters = DEFAULT_ITERATIONS;
> +
> +       mutex_lock(&udelay_test_lock);
> +       udelay_test_usecs = usecs;
> +       udelay_test_iterations = iters;
> +       mutex_unlock(&udelay_test_lock);
> +
> +       return count;
> +}
> +
> +static const struct file_operations udelay_test_debugfs_ops = {
> +       .owner = THIS_MODULE,
> +       .open = udelay_test_open,
> +       .read = seq_read,
> +       .write = udelay_test_write,
> +       .llseek = seq_lseek,
> +       .release = single_release,
> +};
> +
> +static int __init udelay_test_init(void)
> +{
> +       mutex_lock(&udelay_test_lock);
> +       udelay_test_debugfs_file = debugfs_create_file(DEBUGFS_FILENAME,
> +                       S_IRUSR, NULL, NULL, &udelay_test_debugfs_ops);
> +       mutex_unlock(&udelay_test_lock);
> +
> +       return 0;
> +}
> +
> +module_init(udelay_test_init);
> +
> +static void __exit udelay_test_exit(void)
> +{
> +       mutex_lock(&udelay_test_lock);
> +       debugfs_remove(udelay_test_debugfs_file);
> +       mutex_unlock(&udelay_test_lock);
> +}
> +
> +module_exit(udelay_test_exit);
> +
> +MODULE_AUTHOR("David Riley <davidriley@chromium.org>");
> +MODULE_LICENSE("GPL");
> diff --git a/kernel/time/udelay_test.c b/kernel/time/udelay_test.c
> deleted file mode 100644
> index e622ba3..0000000
> --- a/kernel/time/udelay_test.c
> +++ /dev/null
> @@ -1,168 +0,0 @@
> -/*
> - * udelay() test kernel module
> - *
> - * Test is executed by writing and reading to /sys/kernel/debug/udelay_test
> - * Tests are configured by writing: USECS ITERATIONS
> - * Tests are executed by reading from the same file.
> - * Specifying usecs of 0 or negative values will run multiples tests.
> - *
> - * Copyright (C) 2014 Google, Inc.
> - *
> - * This software is licensed under the terms of the GNU General Public
> - * License version 2, as published by the Free Software Foundation, and
> - * may be copied, distributed, and modified under those terms.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - */
> -
> -#include <linux/debugfs.h>
> -#include <linux/delay.h>
> -#include <linux/ktime.h>
> -#include <linux/module.h>
> -#include <linux/uaccess.h>
> -
> -#define DEFAULT_ITERATIONS 100
> -
> -#define DEBUGFS_FILENAME "udelay_test"
> -
> -static DEFINE_MUTEX(udelay_test_lock);
> -static struct dentry *udelay_test_debugfs_file;
> -static int udelay_test_usecs;
> -static int udelay_test_iterations = DEFAULT_ITERATIONS;
> -
> -static int udelay_test_single(struct seq_file *s, int usecs, uint32_t iters)
> -{
> -       int min = 0, max = 0, fail_count = 0;
> -       uint64_t sum = 0;
> -       uint64_t avg;
> -       int i;
> -       /* Allow udelay to be up to 0.5% fast */
> -       int allowed_error_ns = usecs * 5;
> -
> -       for (i = 0; i < iters; ++i) {
> -               struct timespec ts1, ts2;
> -               int time_passed;
> -
> -               ktime_get_ts(&ts1);
> -               udelay(usecs);
> -               ktime_get_ts(&ts2);
> -               time_passed = timespec_to_ns(&ts2) - timespec_to_ns(&ts1);
> -
> -               if (i == 0 || time_passed < min)
> -                       min = time_passed;
> -               if (i == 0 || time_passed > max)
> -                       max = time_passed;
> -               if ((time_passed + allowed_error_ns) / 1000 < usecs)
> -                       ++fail_count;
> -               WARN_ON(time_passed < 0);
> -               sum += time_passed;
> -       }
> -
> -       avg = sum;
> -       do_div(avg, iters);
> -       seq_printf(s, "%d usecs x %d: exp=%d allowed=%d min=%d avg=%lld max=%d",
> -                       usecs, iters, usecs * 1000,
> -                       (usecs * 1000) - allowed_error_ns, min, avg, max);
> -       if (fail_count)
> -               seq_printf(s, " FAIL=%d", fail_count);
> -       seq_puts(s, "\n");
> -
> -       return 0;
> -}
> -
> -static int udelay_test_show(struct seq_file *s, void *v)
> -{
> -       int usecs;
> -       int iters;
> -       int ret = 0;
> -
> -       mutex_lock(&udelay_test_lock);
> -       usecs = udelay_test_usecs;
> -       iters = udelay_test_iterations;
> -       mutex_unlock(&udelay_test_lock);
> -
> -       if (usecs > 0 && iters > 0) {
> -               return udelay_test_single(s, usecs, iters);
> -       } else if (usecs == 0) {
> -               struct timespec ts;
> -
> -               ktime_get_ts(&ts);
> -               seq_printf(s, "udelay() test (lpj=%ld kt=%ld.%09ld)\n",
> -                               loops_per_jiffy, ts.tv_sec, ts.tv_nsec);
> -               seq_puts(s, "usage:\n");
> -               seq_puts(s, "echo USECS [ITERS] > " DEBUGFS_FILENAME "\n");
> -               seq_puts(s, "cat " DEBUGFS_FILENAME "\n");
> -       }
> -
> -       return ret;
> -}
> -
> -static int udelay_test_open(struct inode *inode, struct file *file)
> -{
> -       return single_open(file, udelay_test_show, inode->i_private);
> -}
> -
> -static ssize_t udelay_test_write(struct file *file, const char __user *buf,
> -               size_t count, loff_t *pos)
> -{
> -       char lbuf[32];
> -       int ret;
> -       int usecs;
> -       int iters;
> -
> -       if (count >= sizeof(lbuf))
> -               return -EINVAL;
> -
> -       if (copy_from_user(lbuf, buf, count))
> -               return -EFAULT;
> -       lbuf[count] = '\0';
> -
> -       ret = sscanf(lbuf, "%d %d", &usecs, &iters);
> -       if (ret < 1)
> -               return -EINVAL;
> -       else if (ret < 2)
> -               iters = DEFAULT_ITERATIONS;
> -
> -       mutex_lock(&udelay_test_lock);
> -       udelay_test_usecs = usecs;
> -       udelay_test_iterations = iters;
> -       mutex_unlock(&udelay_test_lock);
> -
> -       return count;
> -}
> -
> -static const struct file_operations udelay_test_debugfs_ops = {
> -       .owner = THIS_MODULE,
> -       .open = udelay_test_open,
> -       .read = seq_read,
> -       .write = udelay_test_write,
> -       .llseek = seq_lseek,
> -       .release = single_release,
> -};
> -
> -static int __init udelay_test_init(void)
> -{
> -       mutex_lock(&udelay_test_lock);
> -       udelay_test_debugfs_file = debugfs_create_file(DEBUGFS_FILENAME,
> -                       S_IRUSR, NULL, NULL, &udelay_test_debugfs_ops);
> -       mutex_unlock(&udelay_test_lock);
> -
> -       return 0;
> -}
> -
> -module_init(udelay_test_init);
> -
> -static void __exit udelay_test_exit(void)
> -{
> -       mutex_lock(&udelay_test_lock);
> -       debugfs_remove(udelay_test_debugfs_file);
> -       mutex_unlock(&udelay_test_lock);
> -}
> -
> -module_exit(udelay_test_exit);
> -
> -MODULE_AUTHOR("David Riley <davidriley@chromium.org>");
> -MODULE_LICENSE("GPL");
> --
> 1.9.1
>

linux-next: manual merge of the driver-core tree with the tip tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 816 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in arch/x86/Kconfig between commit b4df597ae51f ("audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL") from the tip tree and commit 2b9c1f03278 ("x86: align x86 arch with generic CPU modalias handling") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc arch/x86/Kconfig
index 81f8485bb6b7,7fab7e0b1a72..000000000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -127,7 -127,7 +127,8 @@@ config X8
        select HAVE_DEBUG_STACKOVERFLOW
        select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
        select HAVE_CC_STACKPROTECTOR
 +      select HAVE_ARCH_AUDITSYSCALL
+       select GENERIC_CPU_AUTOPROBE
  
  config INSTRUCTION_DECODER
        def_bool y

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with the tip tree

[Greg KH]

On Thu, Apr 11, 2013 at 03:30:23PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> kernel/rtmutex-tester.c between commit 8184004ed7a0
> ("locking/rtmutex/tester: Set correct permissions on sysfs files") from
> the tip tree and commit 928c0c1571b0 ("rtmutex-tester: fix mode of sysfs
> files") from the driver-core tree.
> 
> Both patches do the same thing - I used the tip version and can carry the
> fix as necessary (no action is required).

Thanks for the heads up.

greg k-h

linux-next: manual merge of the driver-core tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 510 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
kernel/rtmutex-tester.c between commit 8184004ed7a0
("locking/rtmutex/tester: Set correct permissions on sysfs files") from
the tip tree and commit 928c0c1571b0 ("rtmutex-tester: fix mode of sysfs
files") from the driver-core tree.

Both patches do the same thing - I used the tip version and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with the tip tree

[Greg KH]

On Thu, Nov 29, 2012 at 03:24:11PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> lib/Makefile between commit e6459606b04e ("lib: Add early cpio decoder")
> from the tip tree and commit 610141ee651c ("lib: kobject_uevent is no
> longer dependant on CONFIG_HOTPLUG") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

greg k-h

linux-next: manual merge of the driver-core tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1060 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
lib/Makefile between commit e6459606b04e ("lib: Add early cpio decoder")
from the tip tree and commit 610141ee651c ("lib: kobject_uevent is no
longer dependant on CONFIG_HOTPLUG") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc lib/Makefile
index e91b9df,66787b9..0000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -12,7 -12,7 +12,7 @@@ lib-y := ctype.o string.o vsprintf.o cm
  	 idr.o int_sqrt.o extable.o \
  	 sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \
  	 proportions.o flex_proportions.o prio_heap.o ratelimit.o show_mem.o \
- 	 is_single_threaded.o plist.o decompress.o earlycpio.o
 -	 is_single_threaded.o plist.o decompress.o kobject_uevent.o
++	 is_single_threaded.o plist.o decompress.o earlycpio.o kobject_uevent.o
  
  lib-$(CONFIG_MMU) += ioremap.o
  lib-$(CONFIG_SMP) += cpumask.o

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with the tip tree

[Greg KH]

On Wed, Dec 28, 2011 at 03:57:07PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> include/linux/cpu.h between commit 2987557f52b9 ("driver-core/cpu: Expose
> hotpluggability to the rest of the kernel") from the tip tree and commit
> 8a25a2fd126c ("cpu: convert 'cpu' and 'machinecheck' sysdev_class to a
> regular subsystem") from the driver-core tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary

Looks fine, thanks.

greg k-h

linux-next: manual merge of the driver-core tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1705 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
include/linux/cpu.h between commit 2987557f52b9 ("driver-core/cpu: Expose
hotpluggability to the rest of the kernel") from the tip tree and commit
8a25a2fd126c ("cpu: convert 'cpu' and 'machinecheck' sysdev_class to a
regular subsystem") from the driver-core tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/cpu.h
index 305c263,fc3da0d..0000000
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@@ -26,16 -26,15 +26,16 @@@ struct cpu 
  };
  
  extern int register_cpu(struct cpu *cpu, int num);
- extern struct sys_device *get_cpu_sysdev(unsigned cpu);
+ extern struct device *get_cpu_device(unsigned cpu);
 +extern bool cpu_is_hotpluggable(unsigned cpu);
  
- extern int cpu_add_sysdev_attr(struct sysdev_attribute *attr);
- extern void cpu_remove_sysdev_attr(struct sysdev_attribute *attr);
+ extern int cpu_add_dev_attr(struct device_attribute *attr);
+ extern void cpu_remove_dev_attr(struct device_attribute *attr);
  
- extern int cpu_add_sysdev_attr_group(struct attribute_group *attrs);
- extern void cpu_remove_sysdev_attr_group(struct attribute_group *attrs);
+ extern int cpu_add_dev_attr_group(struct attribute_group *attrs);
+ extern void cpu_remove_dev_attr_group(struct attribute_group *attrs);
  
- extern int sched_create_sysfs_power_savings_entries(struct sysdev_class *cls);
+ extern int sched_create_sysfs_power_savings_entries(struct device *dev);
  
  #ifdef CONFIG_HOTPLUG_CPU
  extern void unregister_cpu(struct cpu *cpu);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]