* Ingo Molnar <mingo@elte.hu> wrote:scratch that 24 hours - the patch is obviously correct as it only removes the nonsensical bits that get duplicated below anyway. Linus, please pull the latest x86 git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git for-linus Thanks, Ingo ------------------> Ingo Molnar (1): x86: prefetch fix #2 arch/x86/mm/fault.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index c0c82bc..ec08d83 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -91,13 +91,10 @@ static int is_prefetch(struct pt_regs *regs, unsigned long addr, int prefetch = 0; unsigned char *max_instr; -#ifdef CONFIG_X86_32 - /* Catch an obscure case of prefetch inside an NX page: */ - if ((__supported_pte_mask & _PAGE_NX) && (error_code & 16)) - return 0; -#endif - - /* If it was a exec fault on NX page, ignore */ + /* + * If it was a exec (instruction fetch) fault on NX page, then + * do not ignore the fault: + */ if (error_code & PF_INSTR) return 0; --
| Roland Dreier | Re: Integration of SCST in the mainstream Linux kernel |
| Greg KH | Linux 2.6.25.10 |
| Linus Torvalds | Re: [stable] Linux 2.6.25.10 |
| Greg Kroah-Hartman | [PATCH 005/196] Chinese: add translation of SubmittingDrivers |
| Edwin Eyan Moragas | poll(2) vs kqueue(2) performance |
| Jonathan Thornburg | strlcat/strlcpy vs overlapping arguments |
| askthelist | Packets Per Second Limit? |
| Siju George | Skype on OpenBSD 4.1 using Fedora RPM |
git: | |
| Michael Hendricks | removing content from git history |
| Elijah Newren | Trying to use git-filter-branch to compress history by removing large, obsolete bi... |
| Junio C Hamano | Re: bad git pull |
| Junio C Hamano | Re: More precise tag following |
| Jim Winstead Jr. | Re: Root Disk/Book Disk Compatibility |
| Sagan | 387 failed error [help needed] |
| David Hobley | linux support for (PC) notebooks |
| Joel M. Hoffman | Re: How to disable C-A-D for non-root users? |
