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

   1 From: Henrik Kretzschmar <henne@nachtwindheim.de>
   2 Subject: [PATCH 1/6] x86: move ioapic_irq_destination_types
   3 Date: Mon, 14 Feb 2011 11:00:07 +0100
   4 Lines: 55
   5 Message-ID: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de>
   6 Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, tj@kernel.org,
   7         yinghai@kernel.org, ak@linux.intel.com, robert.richter@amd.com,
   8         linux-kernel@vger.kernel.org, henne@nachtwindheim.de
   9 To: mingo@readhat.com
  10 X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 11:00:33 2011
  11 Return-path: <linux-kernel-owner@vger.kernel.org>
  12 Envelope-to: glk-linux-kernel-3@lo.gmane.org
  13 Received: from vger.kernel.org ([209.132.180.67])
  14         by lo.gmane.org with esmtp (Exim 4.69)
  15         (envelope-from <linux-kernel-owner@vger.kernel.org>)
  16         id 1PovEP-0006ED-4Z
  17         for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 11:00:33 +0100
  18 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
  19         id S1752832Ab1BNKAX (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
  20         Mon, 14 Feb 2011 05:00:23 -0500
  21 Received: from server103.greatnet.de ([83.133.97.6]:38305 "EHLO
  22         server103.greatnet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
  23         with ESMTP id S1752268Ab1BNKAW (ORCPT
  24         <rfc822;linux-kernel@vger.kernel.org>);
  25         Mon, 14 Feb 2011 05:00:22 -0500
  26 Received: from localhost.localdomain (cmnz-d9bab6be.pool.mediaWays.net [217.186.182.190])
  27         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
  28         (No client certificate requested)
  29         by server103.greatnet.de (Postfix) with ESMTPSA id D2234950DB2;
  30         Mon, 14 Feb 2011 10:59:03 +0100 (CET)
  31 X-Mailer: git-send-email 1.7.1
  32 Sender: linux-kernel-owner@vger.kernel.org
  33 Precedence: bulk
  34 List-ID: <linux-kernel.vger.kernel.org>
  35 X-Mailing-List: linux-kernel@vger.kernel.org
  36 Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099645>
  37
  38 This enum is used also by non-ioapic code, e.g apic_noop,
  39 so its better kept in apicdef.h.
  40
  41 Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
  42 ---
  43  arch/x86/include/asm/apicdef.h |   12 ++++++++++++
  44  arch/x86/include/asm/io_apic.h |   11 -----------
  45  2 files changed, 12 insertions(+), 11 deletions(-)
  46
  47 diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h
  48 index 47a30ff..2de3e95 100644
  49 --- a/arch/x86/include/asm/apicdef.h
  50 +++ b/arch/x86/include/asm/apicdef.h
  51 @@ -426,4 +426,16 @@ struct local_apic {
  52  #else
  53   #define BAD_APICID 0xFFFFu
  54  #endif
  55 +
  56 +enum ioapic_irq_destination_types {
  57 +       dest_Fixed = 0,
  58 +       dest_LowestPrio = 1,
  59 +       dest_SMI = 2,
  60 +       dest__reserved_1 = 3,
  61 +       dest_NMI = 4,
  62 +       dest_INIT = 5,
  63 +       dest__reserved_2 = 6,
  64 +       dest_ExtINT = 7
  65 +};
  66 +
  67  #endif /* _ASM_X86_APICDEF_H */
  68 diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
  69 index f327d38..e1a9b0e 100644
  70 --- a/arch/x86/include/asm/io_apic.h
  71 +++ b/arch/x86/include/asm/io_apic.h
  72 @@ -63,17 +63,6 @@ union IO_APIC_reg_03 {
  73         } __attribute__ ((packed)) bits;
  74  };
  75
  76 -enum ioapic_irq_destination_types {
  77 -       dest_Fixed = 0,
  78 -       dest_LowestPrio = 1,
  79 -       dest_SMI = 2,
  80 -       dest__reserved_1 = 3,
  81 -       dest_NMI = 4,
  82 -       dest_INIT = 5,
  83 -       dest__reserved_2 = 6,
  84 -       dest_ExtINT = 7
  85 -};
  86 -
  87  struct IO_APIC_route_entry {
  88         __u32   vector          :  8,
  89                 delivery_mode   :  3,   /* 000: FIXED
  90 --
  91 1.7.2.3
  92
  93
  94