Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2018-01-12 18:06:46 +0100
committerMichal Suchanek <msuchanek@suse.de>2018-01-12 18:06:46 +0100
commit77b0afb86730dc8abb38acfe3ce59e87ca0ceff7 (patch)
tree108482da3c08d46cf99ea274b59c0c80f2cabc28
parent7419239484f6ab14da751680ea25cc7a405b37b8 (diff)
Refresh patches.arch/powerpc-rfi-flush-Move-the-logic-to-avoid-a-redo-int.patch.
Add missing hunk
-rw-r--r--patches.arch/powerpc-rfi-flush-Move-the-logic-to-avoid-a-redo-int.patch16
1 files changed, 13 insertions, 3 deletions
diff --git a/patches.arch/powerpc-rfi-flush-Move-the-logic-to-avoid-a-redo-int.patch b/patches.arch/powerpc-rfi-flush-Move-the-logic-to-avoid-a-redo-int.patch
index 8467235e49..6a186213b5 100644
--- a/patches.arch/powerpc-rfi-flush-Move-the-logic-to-avoid-a-redo-int.patch
+++ b/patches.arch/powerpc-rfi-flush-Move-the-logic-to-avoid-a-redo-int.patch
@@ -24,8 +24,8 @@ Signed-off-by: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
Acked-by: Michal Suchanek <msuchanek@suse.de>
---
arch/powerpc/kernel/setup_64.c | 3 ---
- arch/powerpc/kernel/sysfs.c | 43 ++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 43 insertions(+), 3 deletions(-)
+ arch/powerpc/kernel/sysfs.c | 46 ++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 7e34cbdd5080..525649400965 100644
@@ -42,7 +42,7 @@ index 7e34cbdd5080..525649400965 100644
do_rfi_flush_fixups(enabled_flush_types);
on_each_cpu(do_nothing, NULL, 1);
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
-index 4437c70c7c2b..c6292d050a01 100644
+index 4437c70c7c2b..cba34571027e 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -496,6 +496,49 @@ static DEVICE_ATTR(spurr, 0400, show_spurr, NULL);
@@ -95,6 +95,16 @@ index 4437c70c7c2b..c6292d050a01 100644
/*
* This is the system wide DSCR register default value. Any
* change to this default value through the sysfs interface
+@@ -1036,6 +1079,9 @@ static int __init topology_init(void)
+ WARN_ON(r < 0);
+ #ifdef CONFIG_PPC64
+ sysfs_create_dscr_default();
++#ifdef CONFIG_PPC_BOOK3S
++ sysfs_create_rfi_flush();
++#endif
+ #endif /* CONFIG_PPC64 */
+
+ return 0;
--
2.13.6