Subject: + hwpoison-remove-unused-global-variable-in-do_machine_check.patch added to -mm tree
To: slaoub@xxxxxxxxx,andi@xxxxxxxxxxxxxx,fengguang.wu@xxxxxxxxx,hpa@xxxxxxxxx,mingo@xxxxxxx,n-horiguchi@xxxxxxxxxxxxx,tglx@xxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 20 May 2014 15:13:14 -0700
The patch titled
Subject: hwpoison: remove unused global variable in do_machine_check()
has been added to the -mm tree. Its filename is
hwpoison-remove-unused-global-variable-in-do_machine_check.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/hwpoison-remove-unused-global-variable-in-do_machine_check.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/hwpoison-remove-unused-global-variable-in-do_machine_check.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Chen Yucong <slaoub@xxxxxxxxx>
Subject: hwpoison: remove unused global variable in do_machine_check()
Remove an unused global variable mce_entry and relative operations in
do_machine_check().
Signed-off-by: Chen Yucong <slaoub@xxxxxxxxx>
Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Cc: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/mce.h | 2 --
arch/x86/kernel/cpu/mcheck/mce.c | 5 -----
2 files changed, 7 deletions(-)
diff -puN arch/x86/include/asm/mce.h~hwpoison-remove-unused-global-variable-in-do_machine_check arch/x86/include/asm/mce.h
--- a/arch/x86/include/asm/mce.h~hwpoison-remove-unused-global-variable-in-do_machine_check
+++ a/arch/x86/include/asm/mce.h
@@ -176,8 +176,6 @@ int mce_available(struct cpuinfo_x86 *c)
DECLARE_PER_CPU(unsigned, mce_exception_count);
DECLARE_PER_CPU(unsigned, mce_poll_count);
-extern atomic_t mce_entry;
-
typedef DECLARE_BITMAP(mce_banks_t, MAX_NR_BANKS);
DECLARE_PER_CPU(mce_banks_t, mce_poll_banks);
diff -puN arch/x86/kernel/cpu/mcheck/mce.c~hwpoison-remove-unused-global-variable-in-do_machine_check arch/x86/kernel/cpu/mcheck/mce.c
--- a/arch/x86/kernel/cpu/mcheck/mce.c~hwpoison-remove-unused-global-variable-in-do_machine_check
+++ a/arch/x86/kernel/cpu/mcheck/mce.c
@@ -60,8 +60,6 @@ static DEFINE_MUTEX(mce_chrdev_read_mute
#define SPINUNIT 100 /* 100ns */
-atomic_t mce_entry;
-
DEFINE_PER_CPU(unsigned, mce_exception_count);
struct mce_bank *mce_banks __read_mostly;
@@ -1041,8 +1039,6 @@ void do_machine_check(struct pt_regs *re
DECLARE_BITMAP(valid_banks, MAX_NR_BANKS);
char *msg = "Unknown";
- atomic_inc(&mce_entry);
-
this_cpu_inc(mce_exception_count);
if (!cfg->banks)
@@ -1172,7 +1168,6 @@ void do_machine_check(struct pt_regs *re
mce_report_event(regs);
mce_wrmsrl(MSR_IA32_MCG_STATUS, 0);
out:
- atomic_dec(&mce_entry);
sync_core();
}
EXPORT_SYMBOL_GPL(do_machine_check);
_
Patches currently in -mm which might be from slaoub@xxxxxxxxx are
hwposion-hugetlb-lock_page-unlock_page-does-not-match-for-handling-a-free-hugepage.patch
hwpoison-remove-unused-global-variable-in-do_machine_check.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
