Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1026-2.6.25-xen-DMI-Define-dmi_scan_machine-as-no-op-if-CONFIG_DM.patch

    Annotation of /trunk/kernel26-xen/patches-2.6.25-r1/1026-2.6.25-xen-DMI-Define-dmi_scan_machine-as-no-op-if-CONFIG_DM.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 606 - (hide annotations) (download)
    Thu May 22 23:13:13 2008 UTC (16 years ago) by niro
    File size: 1040 byte(s) 
    -ver bump to 2.6.25-magellan-r1:
- linux-2.6.25.4
- fbcondecor-0.9.4
- squashfs-3.3
- unionfs-2.3.3
- tuxonice-3.0-rc7
- linux-phc-0.3.0
- acpi-dstd-0.9a
- reiser4
- xen-3.2.0
. ipw3945-1.2.2
    1 niro 606 From 51a3177fa69becc4211e7d471128fc611e0b8727 Mon Sep 17 00:00:00 2001
    2     From: Eduardo Habkost <ehabkost@monstro.(none)>
    3     Date: Thu, 28 Feb 2008 12:16:04 -0300
    4     Subject: [PATCH] DMI: Define dmi_scan_machine() as no-op if CONFIG_DMI is not set
    5    
    6     This allows arch/x86 to build if CONFIG_DMI can be disabled in the
    7     future.
    8    
    9     Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    10     Signed-off-by: Mark McLoughlin <markmc@redhat.com>
    11     ---
    12     include/linux/dmi.h | 1 +
    13     1 files changed, 1 insertions(+), 0 deletions(-)
    14    
    15     diff --git a/include/linux/dmi.h b/include/linux/dmi.h
    16     index 325acdf..96a9f0f 100644
    17     --- a/include/linux/dmi.h
    18     +++ b/include/linux/dmi.h
    19     @@ -86,6 +86,7 @@ extern int dmi_walk(void (*decode)(const struct dmi_header *));
    20    
    21     #else
    22    
    23     +static inline void dmi_scan_machine(void) { }
    24     static inline int dmi_check_system(const struct dmi_system_id *list) { return 0; }
    25     static inline const char * dmi_get_system_info(int field) { return NULL; }
    26     static inline const struct dmi_device * dmi_find_device(int type, const char *name,
    27     --
    28     1.5.4.1
    29