https://github.com/torvalds/linux
Revision 04e36857d6747e4525e68c4292c081b795b48366 authored by Linus Torvalds on 19 November 2016, 00:45:21 UTC, committed by Linus Torvalds on 19 November 2016, 00:45:21 UTC
Pull kbuild fixes from Michal Marek: "Here are some regression fixes for kbuild: - modversion support for exported asm symbols (Nick Piggin). The affected architectures need separate patches adding asm-prototypes.h. - fix rebuilds of lib-ksyms.o (Nick Piggin) - -fno-PIE builds (Sebastian Siewior and Borislav Petkov). This is not a kernel regression, but one of the Debian gcc package. Nevertheless, it's quite annoying, so I think it should go into mainline and stable now" * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild: Steal gcc's pie from the very beginning kbuild: be more careful about matching preprocessed asm ___EXPORT_SYMBOL x86/kexec: add -fno-PIE scripts/has-stack-protector: add -fno-PIE kbuild: add -fno-PIE kbuild: modversions for EXPORT_SYMBOL() for asm kbuild: prevent lib-ksyms.o rebuilds
Tip revision: 04e36857d6747e4525e68c4292c081b795b48366 authored by Linus Torvalds on 19 November 2016, 00:45:21 UTC
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Tip revision: 04e3685
pm-notifier-error-inject.c
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/suspend.h>
#include "notifier-error-inject.h"
static int priority;
module_param(priority, int, 0);
MODULE_PARM_DESC(priority, "specify PM notifier priority");
static struct notifier_err_inject pm_notifier_err_inject = {
.actions = {
{ NOTIFIER_ERR_INJECT_ACTION(PM_HIBERNATION_PREPARE) },
{ NOTIFIER_ERR_INJECT_ACTION(PM_SUSPEND_PREPARE) },
{ NOTIFIER_ERR_INJECT_ACTION(PM_RESTORE_PREPARE) },
{}
}
};
static struct dentry *dir;
static int err_inject_init(void)
{
int err;
dir = notifier_err_inject_init("pm", notifier_err_inject_dir,
&pm_notifier_err_inject, priority);
if (IS_ERR(dir))
return PTR_ERR(dir);
err = register_pm_notifier(&pm_notifier_err_inject.nb);
if (err)
debugfs_remove_recursive(dir);
return err;
}
static void err_inject_exit(void)
{
unregister_pm_notifier(&pm_notifier_err_inject.nb);
debugfs_remove_recursive(dir);
}
module_init(err_inject_init);
module_exit(err_inject_exit);
MODULE_DESCRIPTION("PM notifier error injection module");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Akinobu Mita <akinobu.mita@gmail.com>");
Computing file changes ...