Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1078-2.6.25-xen-New-enum-fixed_addresses-values-REVIEWME.patch

    Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1078-2.6.25-xen-New-enum-fixed_addresses-values-REVIEWME.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 606 - (show annotations) (download)
    Thu May 22 23:13:13 2008 UTC (16 years ago) by niro
    File size: 1579 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 From 74e7559fcb455bb5922d54d3b1a8f2840a3e9f67 Mon Sep 17 00:00:00 2001
    2 From: Eduardo Habkost <ehabkost@redhat.com>
    3 Date: Wed, 23 Jan 2008 13:28:40 -0200
    4 Subject: [PATCH] New enum fixed_addresses values (REVIEWME)
    5
    6 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    7 ---
    8 include/asm-x86/fixmap_32.h | 3 +++
    9 include/asm-x86/fixmap_64.h | 9 +++++++++
    10 2 files changed, 12 insertions(+), 0 deletions(-)
    11
    12 diff --git a/include/asm-x86/fixmap_32.h b/include/asm-x86/fixmap_32.h
    13 index c2e450a..9388399 100644
    14 --- a/include/asm-x86/fixmap_32.h
    15 +++ b/include/asm-x86/fixmap_32.h
    16 @@ -89,6 +89,9 @@ enum fixed_addresses {
    17 #ifdef CONFIG_PARAVIRT
    18 FIX_PARAVIRT_BOOTMAP,
    19 #endif
    20 +#define NR_FIX_ISAMAPS 256
    21 + FIX_ISAMAP_END,
    22 + FIX_ISAMAP_BEGIN = FIX_ISAMAP_END + NR_FIX_ISAMAPS - 1,
    23 __end_of_permanent_fixed_addresses,
    24 /*
    25 * 256 temporary boot-time mappings, used by early_ioremap(),
    26 diff --git a/include/asm-x86/fixmap_64.h b/include/asm-x86/fixmap_64.h
    27 index 0ffb60c..6f632e1 100644
    28 --- a/include/asm-x86/fixmap_64.h
    29 +++ b/include/asm-x86/fixmap_64.h
    30 @@ -50,6 +50,15 @@ enum fixed_addresses {
    31 #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
    32 FIX_OHCI1394_BASE,
    33 #endif
    34 +#define NR_FIX_ISAMAPS 256
    35 + FIX_ISAMAP_END,
    36 + FIX_ISAMAP_BEGIN = FIX_ISAMAP_END + NR_FIX_ISAMAPS - 1,
    37 + __end_of_permanent_fixed_addresses,
    38 + /* temporary boot-time mappings, used before ioremap() is functional */
    39 +#define NR_FIX_BTMAPS 16
    40 + FIX_BTMAP_END = __end_of_permanent_fixed_addresses,
    41 + FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS - 1,
    42 + FIX_WP_TEST,
    43 __end_of_fixed_addresses
    44 };
    45
    46 --
    47 1.5.4.1
    48