From patchwork Mon Apr 19 08:31:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 50431 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CE44DB7CFA for ; Mon, 19 Apr 2010 18:31:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752943Ab0DSIbp (ORCPT ); Mon, 19 Apr 2010 04:31:45 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:56630 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752855Ab0DSIbp (ORCPT ); Mon, 19 Apr 2010 04:31:45 -0400 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 69B0324C090 for ; Mon, 19 Apr 2010 01:31:49 -0700 (PDT) Date: Mon, 19 Apr 2010 01:31:49 -0700 (PDT) Message-Id: <20100419.013149.102562663.davem@davemloft.net> To: sparclinux@vger.kernel.org Subject: [PATCH] sparc64: Fix PREEMPT_ACTIVE value. From: David Miller X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org It currently overlaps the NMI bit. Signed-off-by: David S. Miller --- I noticed this while auditing some other things. arch/sparc/include/asm/thread_info_64.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h index 9e2d944..4827a3a 100644 --- a/arch/sparc/include/asm/thread_info_64.h +++ b/arch/sparc/include/asm/thread_info_64.h @@ -111,7 +111,7 @@ struct thread_info { #define THREAD_SHIFT PAGE_SHIFT #endif /* PAGE_SHIFT == 13 */ -#define PREEMPT_ACTIVE 0x4000000 +#define PREEMPT_ACTIVE 0x10000000 /* * macros/functions for gaining access to the thread information structure