linux-kernel - linux-next: manual merge of the kmemcheck tree with the x86 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20090601175538.3b904a51.sfr@canb.auug.org.au>
Date:	Mon, 1 Jun 2009 17:55:38 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Vegard Nossum <vegard.nossum@...il.com>,
	Pekka Enberg <penberg@...helsinki.fi>,
	Ingo Molnar <mingo@...e.hu>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thomas Gleixner <tglx@...utronix.de>,
	"H. Peter Anvin" <hpa@...or.com>
Subject: linux-next: manual merge of the kmemcheck tree with the x86 tree

Hi all,

Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/mm/fault.c between commit
a2bcd4731f77cb77ae4b5e4a3d7f5471cf346c33 ("x86/mm: further cleanups of
fault.c's include file section") from the x86 tree and commit
787ecfaa503dc63ff1831ddc74b15dad49bace1d ("x86: add hooks for kmemcheck")
from the kmemcheck tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/x86/mm/fault.c
index 5ec7ae3,3fcd79a..0000000
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -3,16 -3,41 +3,17 @@@
   *  Copyright (C) 2001, 2002 Andi Kleen, SuSE Labs.
   *  Copyright (C) 2008-2009, Red Hat Inc., Ingo Molnar
   */
 -#include <linux/interrupt.h>
 -#include <linux/mmiotrace.h>
 -#include <linux/bootmem.h>
 -#include <linux/compiler.h>
 -#include <linux/highmem.h>
 -#include <linux/kprobes.h>
 -#include <linux/uaccess.h>
 -#include <linux/vmalloc.h>
 -#include <linux/vt_kern.h>
 -#include <linux/signal.h>
 -#include <linux/kernel.h>
 -#include <linux/ptrace.h>
 -#include <linux/string.h>
 -#include <linux/module.h>
 -#include <linux/kdebug.h>
 -#include <linux/errno.h>
 -#include <linux/magic.h>
 -#include <linux/sched.h>
 -#include <linux/types.h>
 -#include <linux/init.h>
 -#include <linux/mman.h>
 -#include <linux/tty.h>
 -#include <linux/smp.h>
 -#include <linux/mm.h>
 -
 -#include <asm-generic/sections.h>
 -
 +#include <linux/magic.h>		/* STACK_END_MAGIC		*/
 +#include <linux/sched.h>		/* test_thread_flag(), ...	*/
 +#include <linux/kdebug.h>		/* oops_begin/end, ...		*/
 +#include <linux/module.h>		/* search_exception_table	*/
 +#include <linux/bootmem.h>		/* max_low_pfn			*/
 +#include <linux/kprobes.h>		/* __kprobes, ...		*/
 +#include <linux/mmiotrace.h>		/* kmmio_handler, ...		*/
 +
 +#include <asm/traps.h>			/* dotraplinkage, ...		*/
 +#include <asm/pgalloc.h>		/* pgd_*(), ...			*/
+ #include <asm/kmemcheck.h>
 -#include <asm/tlbflush.h>
 -#include <asm/pgalloc.h>
 -#include <asm/segment.h>
 -#include <asm/system.h>
 -#include <asm/proto.h>
 -#include <asm/traps.h>
 -#include <asm/desc.h>
  
  /*
   * Page fault error code bits:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/