Merge branch 'pm-qos'

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / kernel / sysfs.c

diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index d4cbbd1fa75f98c2835e4d2f51a6048787e729c2..8302af6492195b77ac8a5b7f5dfbc69dfc7d43b8 100644 (file)
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -196,8 +196,10 @@ static ssize_t show_dscr_default(struct device *dev,
 
 static void update_dscr(void *dummy)
 {
-       if (!current->thread.dscr_inherit)
+       if (!current->thread.dscr_inherit) {
+               current->thread.dscr = dscr_default;
                mtspr(SPRN_DSCR, dscr_default);
+       }
 }
 
 static ssize_t __used store_dscr_default(struct device *dev,