[tip:,x86/cleanups] x86: Remove definition of DEBUG
diff mbox series

Message ID 161069669846.414.838011020047246326.tip-bot2@tip-bot2
State Accepted
Commit b86cb29287be07041b81f5611e37ae9ffabff876
Headers show
Series
  • [tip:,x86/cleanups] x86: Remove definition of DEBUG
Related show

Commit Message

tip-bot2 for Peter Zijlstra Jan. 15, 2021, 7:44 a.m. UTC
The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     b86cb29287be07041b81f5611e37ae9ffabff876
Gitweb:        https://git.kernel.org/tip/b86cb29287be07041b81f5611e37ae9ffabff876
Author:        Tom Rix <trix@redhat.com>
AuthorDate:    Thu, 14 Jan 2021 13:28:27 -08:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Fri, 15 Jan 2021 08:23:10 +01:00

x86: Remove definition of DEBUG

Defining DEBUG should only be done in development. So remove it.

Signed-off-by: Tom Rix <trix@redhat.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Link: https://lkml.kernel.org/r/20210114212827.47584-1-trix@redhat.com
---
 arch/x86/kernel/cpu/mtrr/generic.c | 1 -
 arch/x86/kernel/cpu/mtrr/mtrr.c    | 2 --
 arch/x86/kernel/pci-iommu_table.c  | 3 ---
 arch/x86/mm/mmio-mod.c             | 2 --
 4 files changed, 8 deletions(-)

Comments

Borislav Petkov Jan. 16, 2021, 1:21 p.m. UTC | #1
On Fri, Jan 15, 2021 at 07:44:58AM -0000, tip-bot2 for Tom Rix wrote:
> The following commit has been merged into the x86/cleanups branch of tip:
> 
> Commit-ID:     b86cb29287be07041b81f5611e37ae9ffabff876
> Gitweb:        https://git.kernel.org/tip/b86cb29287be07041b81f5611e37ae9ffabff876
> Author:        Tom Rix <trix@redhat.com>
> AuthorDate:    Thu, 14 Jan 2021 13:28:27 -08:00
> Committer:     Borislav Petkov <bp@suse.de>
> CommitterDate: Fri, 15 Jan 2021 08:23:10 +01:00
> 
> x86: Remove definition of DEBUG
> 
> Defining DEBUG should only be done in development. So remove it.
> 
> Signed-off-by: Tom Rix <trix@redhat.com>
> Signed-off-by: Borislav Petkov <bp@suse.de>
> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> Link: https://lkml.kernel.org/r/20210114212827.47584-1-trix@redhat.com
> ---
>  arch/x86/kernel/cpu/mtrr/generic.c | 1 -
>  arch/x86/kernel/cpu/mtrr/mtrr.c    | 2 --

Btw, this removes the MTRR ranges output from dmesg - something which
we have had since forever. If you guys think it is still important for
debugging purposes, I can resurrect it by making all those pr_info.

This thing:

MTRR default type: uncachable
MTRR fixed ranges enabled:
  00000-9FFFF write-back
  A0000-BFFFF write-through
  C0000-FFFFF write-protect
MTRR variable ranges enabled:
  0 base 000000000000 mask FFFF80000000 write-back
  1 base 000080000000 mask FFFFC0000000 write-back
  2 base 0000C0000000 mask FFFFE0000000 write-back
  3 disabled
  4 disabled
  5 disabled
  6 disabled
  7 disabled
TOM2: 0000000820000000 aka 33280M

Patch
diff mbox series

diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 23ad8e9..2cf4465 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -3,7 +3,6 @@ 
  * This only handles 32bit MTRR on 32bit hosts. This is strictly wrong
  * because MTRRs can span up to 40 bits (36bits on most modern x86)
  */
-#define DEBUG
 
 #include <linux/export.h>
 #include <linux/init.h>
diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.c b/arch/x86/kernel/cpu/mtrr/mtrr.c
index 61eb26e..28c8a23 100644
--- a/arch/x86/kernel/cpu/mtrr/mtrr.c
+++ b/arch/x86/kernel/cpu/mtrr/mtrr.c
@@ -31,8 +31,6 @@ 
     System Programming Guide; Section 9.11. (1997 edition - PPro).
 */
 
-#define DEBUG
-
 #include <linux/types.h> /* FIXME: kvm_para.h needs this */
 
 #include <linux/stop_machine.h>
diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
index 2e9006c..42e92ec 100644
--- a/arch/x86/kernel/pci-iommu_table.c
+++ b/arch/x86/kernel/pci-iommu_table.c
@@ -4,9 +4,6 @@ 
 #include <linux/string.h>
 #include <linux/kallsyms.h>
 
-
-#define DEBUG 1
-
 static struct iommu_table_entry * __init
 find_dependents_of(struct iommu_table_entry *start,
 		   struct iommu_table_entry *finish,
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index bd7aff5..cd768da 100644
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -10,8 +10,6 @@ 
 
 #define pr_fmt(fmt) "mmiotrace: " fmt
 
-#define DEBUG 1
-
 #include <linux/moduleparam.h>
 #include <linux/debugfs.h>
 #include <linux/slab.h>