https://github.com/torvalds/linux
Revision 5fa77b54eff1e4fb38494b5a24c66768d6e7c148 authored by Linus Torvalds on 13 July 2014, 19:09:18 UTC, committed by Linus Torvalds on 13 July 2014, 19:09:18 UTC
Pull ARM fixes from Russell King:
 "Another round of fixes for ARM:
   - a set of kprobes fixes from Jon Medhurst
   - fix the revision checking for the L2 cache which wasn't noticed to
     have been broken"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: l2c: fix revision checking
  ARM: kprobes: Fix test code compilation errors for ARMv4 targets
  ARM: kprobes: Disallow instructions with PC and register specified shift
  ARM: kprobes: Prevent known test failures stopping other tests running
2 parent s 33fe3ae + cda390b
Raw File
Tip revision: 5fa77b54eff1e4fb38494b5a24c66768d6e7c148 authored by Linus Torvalds on 13 July 2014, 19:09:18 UTC
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Tip revision: 5fa77b5
cpu-notifier-error-inject.c
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/cpu.h>

#include "notifier-error-inject.h"

static int priority;
module_param(priority, int, 0);
MODULE_PARM_DESC(priority, "specify cpu notifier priority");

static struct notifier_err_inject cpu_notifier_err_inject = {
	.actions = {
		{ NOTIFIER_ERR_INJECT_ACTION(CPU_UP_PREPARE) },
		{ NOTIFIER_ERR_INJECT_ACTION(CPU_UP_PREPARE_FROZEN) },
		{ NOTIFIER_ERR_INJECT_ACTION(CPU_DOWN_PREPARE) },
		{ NOTIFIER_ERR_INJECT_ACTION(CPU_DOWN_PREPARE_FROZEN) },
		{}
	}
};

static struct dentry *dir;

static int err_inject_init(void)
{
	int err;

	dir = notifier_err_inject_init("cpu", notifier_err_inject_dir,
					&cpu_notifier_err_inject, priority);
	if (IS_ERR(dir))
		return PTR_ERR(dir);

	err = register_hotcpu_notifier(&cpu_notifier_err_inject.nb);
	if (err)
		debugfs_remove_recursive(dir);

	return err;
}

static void err_inject_exit(void)
{
	unregister_hotcpu_notifier(&cpu_notifier_err_inject.nb);
	debugfs_remove_recursive(dir);
}

module_init(err_inject_init);
module_exit(err_inject_exit);

MODULE_DESCRIPTION("CPU notifier error injection module");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Akinobu Mita <akinobu.mita@gmail.com>");
back to top