Merge b34133fec8
("Merge tag 'perf-core-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline
Steps on the way to 5.9-rc1 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ib901b7670a0313d91a57bce86c9587a25020cc3d
This commit is contained in:
@@ -26,7 +26,7 @@ int C_A_D = 1;
|
||||
struct pid *cad_pid;
|
||||
EXPORT_SYMBOL(cad_pid);
|
||||
|
||||
#if defined(CONFIG_ARM) || defined(CONFIG_UNICORE32)
|
||||
#if defined(CONFIG_ARM)
|
||||
#define DEFAULT_REBOOT_MODE = REBOOT_HARD
|
||||
#else
|
||||
#define DEFAULT_REBOOT_MODE
|
||||
|
Reference in New Issue
Block a user