git.notmuchmail.org Git - notmuch/blob - test/corpora/lkml/cur/1382298805.004619:2,

   1 From: Henrik Kretzschmar <henne@nachtwindheim.de>
   2 Subject: [PATCH 3/6] x86: ifdef INTR_REMAP code out
   3 Date: Mon, 14 Feb 2011 11:00:09 +0100
   4 Lines: 58
   5 Message-ID: <1297677612-12405-3-git-send-email-henne@nachtwindheim.de>
   6 References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de>
   7 Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, tj@kernel.org,
   8         yinghai@kernel.org, ak@linux.intel.com, robert.richter@amd.com,
   9         linux-kernel@vger.kernel.org, henne@nachtwindheim.de
  10 To: mingo@readhat.com
  11 X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 11:01:30 2011
  12 Return-path: <linux-kernel-owner@vger.kernel.org>
  13 Envelope-to: glk-linux-kernel-3@lo.gmane.org
  14 Received: from vger.kernel.org ([209.132.180.67])
  15         by lo.gmane.org with esmtp (Exim 4.69)
  16         (envelope-from <linux-kernel-owner@vger.kernel.org>)
  17         id 1PovFF-0006cV-Te
  18         for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 11:01:26 +0100
  19 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
  20         id S1753126Ab1BNKBX (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
  21         Mon, 14 Feb 2011 05:01:23 -0500
  22 Received: from server103.greatnet.de ([83.133.97.6]:38330 "EHLO
  23         server103.greatnet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
  24         with ESMTP id S1752268Ab1BNKAX (ORCPT
  25         <rfc822;linux-kernel@vger.kernel.org>);
  26         Mon, 14 Feb 2011 05:00:23 -0500
  27 Received: from localhost.localdomain (cmnz-d9bab6be.pool.mediaWays.net [217.186.182.190])
  28         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
  29         (No client certificate requested)
  30         by server103.greatnet.de (Postfix) with ESMTPSA id 29517950DB4;
  31         Mon, 14 Feb 2011 10:59:07 +0100 (CET)
  32 X-Mailer: git-send-email 1.7.1
  33 In-Reply-To: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de>
  34 Sender: linux-kernel-owner@vger.kernel.org
  35 Precedence: bulk
  36 List-ID: <linux-kernel.vger.kernel.org>
  37 X-Mailing-List: linux-kernel@vger.kernel.org
  38 Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099651>
  39
  40 Interrupt remapping is only available on 64-bit machines,
  41 so it has no place in lapic_resume() for 32bit machines.
  42
  43 Compilation on 32bit machines would produce errors here.
  44
  45 Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
  46 ---
  47  arch/x86/kernel/apic/apic.c |    8 +++++++-
  48  1 files changed, 7 insertions(+), 1 deletions(-)
  49
  50 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
  51 index 27a7497..999c531 100644
  52 --- a/arch/x86/kernel/apic/apic.c
  53 +++ b/arch/x86/kernel/apic/apic.c
  54 @@ -2109,12 +2109,15 @@ static int lapic_resume(struct sys_device *dev)
  55         unsigned long flags;
  56         int maxlvt;
  57         int ret = 0;
  58 -       struct IO_APIC_route_entry **ioapic_entries = NULL;
  59
  60         if (!apic_pm_state.active)
  61                 return 0;
  62
  63         local_irq_save(flags);
  64 +
  65 +#ifdef CONFIG_INTR_REMAP
  66 +       struct IO_APIC_route_entry **ioapic_entries = NULL;
  67 +
  68         if (intr_remapping_enabled) {
  69                 ioapic_entries = alloc_ioapic_entries();
  70                 if (!ioapic_entries) {
  71 @@ -2133,6 +2136,7 @@ static int lapic_resume(struct sys_device *dev)
  72                 mask_IO_APIC_setup(ioapic_entries);
  73                 legacy_pic->mask_all();
  74         }
  75 +#endif
  76
  77         if (x2apic_mode)
  78                 enable_x2apic();
  79 @@ -2173,6 +2177,7 @@ static int lapic_resume(struct sys_device *dev)
  80         apic_write(APIC_ESR, 0);
  81         apic_read(APIC_ESR);
  82
  83 +#ifdef CONFIG_INTR_REMAP
  84         if (intr_remapping_enabled) {
  85                 reenable_intr_remapping(x2apic_mode);
  86                 legacy_pic->restore_mask();
  87 @@ -2180,6 +2185,7 @@ static int lapic_resume(struct sys_device *dev)
  88                 free_ioapic_entries(ioapic_entries);
  89         }
  90  restore:
  91 +#endif
  92         local_irq_restore(flags);
  93
  94         return ret;
  95 --
  96 1.7.2.3
  97
  98
  99