rpms/kernel-xen-2.6/devel linux-2.6-merge-efifb-imacfb.patch, NONE, 1.1 patch-2.6.25-rc8.bz2.sign, NONE, 1.1 .cvsignore, 1.13, 1.14 .gitignore, 1.3, 1.4 Makefile, 1.9, 1.10 Makefile.config, 1.9, 1.10 config-generic, 1.4, 1.5 config-x86-generic, 1.3, 1.4 config-x86_64-generic, 1.4, 1.5 kernel.spec, 1.26, 1.27 linux-2.6-wireless-pending.patch, 1.3, 1.4 linux-2.6-wireless.patch, 1.4, 1.5 linux-2.6-xen-0001-squashfs-Fix-build-without-CONFIG_SMP.patch, 1.2, 1.3 linux-2.6-xen-0002-xen-execshield-Add-xen-specific-load_user_cs_desc.patch, 1.2, 1.3 linux-2.6-xen-0003-xen-execshield-fix-endless-GPF-fault-loop.patch, 1.2, 1.3 linux-2.6-xen-0004-xen-Do-not-pin-unpin-PMD-pages.patch, 1.1, 1.2 linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch, 1.3, 1.4 linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch, 1.4, 1.5 linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch, 1.4, 1.5 linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch, 1.4, 1.5 linux-2.6-xen-0009-xen-blkfront-Delay-wait-for-block-devices-until-aft.patch, 1.3, 1.4 linux-2.6-xen-0010-xen-Add-a-vmlinuz-target.patch, 1.3, 1.4 linux-2.6-xen-0011-xen-Add-empty-xenctrl-module.patch, 1.3, 1.4 linux-2.6-xen-0012-xen-Add-proc-xen-capabilities.patch, 1.3, 1.4 linux-2.6-xen-0013-xen-Add-proc-xen-privcmd.patch, 1.3, 1.4 linux-2.6-xen-0014-xen-Add-proc-xen-xenbus.patch, 1.3, 1.4 linux-2.6-xen-0015-xen-Add-Xen-s-sys-hypervisor-interface.patch, 1.3, 1.4 linux-2.6-xen-0016-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch, 1.3, 1.4 linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch, 1.4, 1.5 linux-2.6-xen-0018-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch, 1.1, 1.2 linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch, 1.3, 1.4 sources, 1.13, 1.14 upstream, 1.3, 1.4 patch-2.6.25-rc7-git6.bz2.sign, 1.1, NONE patch-2.6.25-rc7.bz2.sign, 1.1, NONE
Mark McLoughlin (markmc)
fedora-extras-commits at redhat.com
Wed Apr 2 08:56:35 UTC 2008
Author: markmc
Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10950
Modified Files:
.cvsignore .gitignore Makefile Makefile.config config-generic
config-x86-generic config-x86_64-generic kernel.spec
linux-2.6-wireless-pending.patch linux-2.6-wireless.patch
linux-2.6-xen-0001-squashfs-Fix-build-without-CONFIG_SMP.patch
linux-2.6-xen-0002-xen-execshield-Add-xen-specific-load_user_cs_desc.patch
linux-2.6-xen-0003-xen-execshield-fix-endless-GPF-fault-loop.patch
linux-2.6-xen-0004-xen-Do-not-pin-unpin-PMD-pages.patch
linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch
linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch
linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch
linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch
linux-2.6-xen-0009-xen-blkfront-Delay-wait-for-block-devices-until-aft.patch
linux-2.6-xen-0010-xen-Add-a-vmlinuz-target.patch
linux-2.6-xen-0011-xen-Add-empty-xenctrl-module.patch
linux-2.6-xen-0012-xen-Add-proc-xen-capabilities.patch
linux-2.6-xen-0013-xen-Add-proc-xen-privcmd.patch
linux-2.6-xen-0014-xen-Add-proc-xen-xenbus.patch
linux-2.6-xen-0015-xen-Add-Xen-s-sys-hypervisor-interface.patch
linux-2.6-xen-0016-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch
linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch
linux-2.6-xen-0018-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch
linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch
sources upstream
Added Files:
linux-2.6-merge-efifb-imacfb.patch patch-2.6.25-rc8.bz2.sign
Removed Files:
patch-2.6.25-rc7-git6.bz2.sign patch-2.6.25-rc7.bz2.sign
Log Message:
* Wed Apr 2 2008 Mark McLoughlin <markmc at redhat.com>
- Update to kernel-2.6.25-0.187.rc8.fc9
- Use ".xen" suffix for some files instead of just "xen" (jwilson)
linux-2.6-merge-efifb-imacfb.patch:
--- NEW FILE linux-2.6-merge-efifb-imacfb.patch ---
Kconfig | 15 --
Makefile | 1
efifb.c | 175 +++++++++++++++++++++++++++--
imacfb.c | 376 ---------------------------------------------------------------
4 files changed, 168 insertions(+), 399 deletions(-)
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 1bd5fb3..474c375 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -656,23 +656,14 @@ config FB_VESA
config FB_EFI
bool "EFI-based Framebuffer Support"
- depends on (FB = y) && X86
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
- help
- This is the EFI frame buffer device driver. If the firmware on
- your platform is UEFI2.0, select Y to add support for
- Graphics Output Protocol for early console messages to appear.
-
-config FB_IMAC
- bool "Intel-based Macintosh Framebuffer Support"
depends on (FB = y) && X86 && EFI
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
help
- This is the frame buffer device driver for the Intel-based Macintosh
+ This is the EFI frame buffer device driver. If the firmware on
+ your platform is EFI 1.10 or UEFI 2.0, select Y to add support for
+ using the EFI framebuffer as your console.
config FB_HECUBA
tristate "Hecuba board support"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 11c0e5e..c789b01 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -118,7 +118,6 @@ obj-$(CONFIG_FB_OMAP) += omap/
# Platform or fallback drivers go here
obj-$(CONFIG_FB_UVESA) += uvesafb.o
obj-$(CONFIG_FB_VESA) += vesafb.o
-obj-$(CONFIG_FB_IMAC) += imacfb.o
obj-$(CONFIG_FB_EFI) += efifb.o
obj-$(CONFIG_FB_VGA16) += vga16fb.o
obj-$(CONFIG_FB_OF) += offb.o
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
index bd779ae..489f030 100644
--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
@@ -12,6 +12,7 @@
#include <linux/fb.h>
#include <linux/platform_device.h>
#include <linux/screen_info.h>
+#include <linux/dmi.h>
#include <video/vga.h>
@@ -33,6 +34,89 @@ static struct fb_fix_screeninfo efifb_fix __initdata = {
.visual = FB_VISUAL_TRUECOLOR,
};
+enum {
+ M_I17, /* 17-Inch iMac */
+ M_I20, /* 20-Inch iMac */
+ M_I20_SR, /* 20-Inch iMac (Santa Rosa) */
+ M_I24, /* 24-Inch iMac */
+ M_MINI, /* Mac Mini */
+ M_MB, /* MacBook */
+ M_MBP, /* MacBook Pro */
+ M_MBP_2, /* MacBook Pro 2nd gen */
+ M_MBP_SR, /* MacBook Pro (Santa Rosa) */
+ M_UNKNOWN /* placeholder */
+};
+
+static struct efifb_dmi_info {
+ char *optname;
+ unsigned long base;
+ int stride;
+ int width;
+ int height;
+} dmi_list[] = {
+ [M_I17] = { "i17", 0x80010000, 1472 * 4, 1440, 900 },
+ [M_I20] = { "i20", 0x80010000, 1728 * 4, 1680, 1050 }, /* guess */
+ [M_I20_SR] = { "imac7", 0x40010000, 1728 * 4, 1680, 1050 },
+ [M_I24] = { "i24", 0x80010000, 2048 * 4, 1920, 1200 }, /* guess */
+ [M_MINI]= { "mini", 0x80000000, 2048 * 4, 1024, 768 },
+ [M_MB] = { "macbook", 0x80000000, 2048 * 4, 1280, 800 },
+ [M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900 },
+ [M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */
+ [M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 },
+ [M_UNKNOWN] = { NULL, 0, 0, 0, 0 }
+};
+
+static int set_system(const struct dmi_system_id *id);
+
+#define EFIFB_DMI_SYSTEM_ID(vendor, name, enumid) \
+ { set_system, name, { \
+ DMI_MATCH(DMI_BIOS_VENDOR, vendor), \
+ DMI_MATCH(DMI_PRODUCT_NAME, name) }, \
+ &dmi_list[enumid] }
+
+static struct dmi_system_id __initdata dmi_system_table[] = {
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac4,1", M_I17),
+ /* At least one of these two will be right; maybe both? */
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac5,1", M_I20),
+ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac5,1", M_I20),
+ /* At least one of these two will be right; maybe both? */
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac6,1", M_I24),
+ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac6,1", M_I24),
+ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac7,1", M_I20_SR),
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "Macmini1,1", M_MINI),
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook1,1", M_MB),
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro1,1", M_MBP),
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,1", M_MBP_2),
+ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro2,1", M_MBP_2),
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR),
+ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR),
+ {},
+};
+
+static int set_system(const struct dmi_system_id *id)
+{
+ struct efifb_dmi_info *info = id->driver_data;
+ if (info->base == 0)
+ return -ENODEV;
+
+ printk(KERN_INFO "efifb: dmi detected %s - framebuffer at %p "
+ "(%dx%d, stride %d)\n", id->ident,
+ (void *)info->base, info->width, info->height,
+ info->stride);
+
+ /* Trust the bootloader over the DMI tables */
+ if (screen_info.lfb_base == 0)
+ screen_info.lfb_base = info->base;
+ if (screen_info.lfb_linelength == 0)
+ screen_info.lfb_linelength = info->stride;
+ if (screen_info.lfb_width == 0)
+ screen_info.lfb_width = info->width;
+ if (screen_info.lfb_height == 0)
+ screen_info.lfb_height = info->height;
+
+ return 0;
+}
+
static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,
unsigned blue, unsigned transp,
struct fb_info *info)
@@ -67,6 +151,38 @@ static struct fb_ops efifb_ops = {
.fb_imageblit = cfb_imageblit,
};
+static int __init efifb_setup(char *options)
+{
+ char *this_opt;
+ int i;
+
+ if (!options || !*options)
+ return 0;
+
+ while ((this_opt = strsep(&options, ",")) != NULL) {
+ if (!*this_opt) continue;
+
+ for (i = 0; i < M_UNKNOWN; i++) {
+ if (!strcmp(this_opt, dmi_list[i].optname) &&
+ dmi_list[i].base != 0) {
+ screen_info.lfb_base = dmi_list[i].base;
+ screen_info.lfb_linelength = dmi_list[i].stride;
+ screen_info.lfb_width = dmi_list[i].width;
+ screen_info.lfb_height = dmi_list[i].height;
+ }
+ }
+ if (!strncmp(this_opt, "base:", 5))
+ screen_info.lfb_base = simple_strtoul(this_opt+5, NULL, 0);
+ else if (!strncmp(this_opt, "stride:", 7))
+ screen_info.lfb_linelength = simple_strtoul(this_opt+7, NULL, 0) * 4;
+ else if (!strncmp(this_opt, "height:", 7))
+ screen_info.lfb_height = simple_strtoul(this_opt+7, NULL, 0);
+ else if (!strncmp(this_opt, "width:", 6))
+ screen_info.lfb_width = simple_strtoul(this_opt+6, NULL, 0);
+ }
+ return 0;
+}
+
static int __init efifb_probe(struct platform_device *dev)
{
struct fb_info *info;
@@ -74,6 +190,26 @@ static int __init efifb_probe(struct platform_device *dev)
unsigned int size_vmode;
unsigned int size_remap;
unsigned int size_total;
+ int request_succeeded = 0;
+
+ printk(KERN_INFO "efifb: probing for efifb\n");
+
+ if (!screen_info.lfb_depth)
+ screen_info.lfb_depth = 32;
+ if (!screen_info.pages)
+ screen_info.pages = 1;
+
+ /* just assume they're all unset if any are */
+ if (!screen_info.blue_size) {
+ screen_info.blue_size = 8;
+ screen_info.blue_pos = 0;
+ screen_info.green_size = 8;
+ screen_info.green_pos = 8;
+ screen_info.red_size = 8;
+ screen_info.red_pos = 16;
+ screen_info.rsvd_size = 8;
+ screen_info.rsvd_pos = 24;
+ }
efifb_fix.smem_start = screen_info.lfb_base;
efifb_defined.bits_per_pixel = screen_info.lfb_depth;
@@ -98,21 +234,25 @@ static int __init efifb_probe(struct platform_device *dev)
* option to simply use size_total as that
* wastes plenty of kernel address space. */
size_remap = size_vmode * 2;
- if (size_remap < size_vmode)
- size_remap = size_vmode;
if (size_remap > size_total)
size_remap = size_total;
+ if (size_remap % PAGE_SIZE)
+ size_remap += PAGE_SIZE - (size_remap % PAGE_SIZE);
efifb_fix.smem_len = size_remap;
- if (!request_mem_region(efifb_fix.smem_start, size_total, "efifb"))
+ if (request_mem_region(efifb_fix.smem_start, size_remap, "efifb")) {
+ request_succeeded = 1;
+ } else {
/* We cannot make this fatal. Sometimes this comes from magic
spaces our resource handlers simply don't know about */
printk(KERN_WARNING
"efifb: cannot reserve video memory at 0x%lx\n",
efifb_fix.smem_start);
+ }
info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev);
if (!info) {
+ printk(KERN_ERR "efifb: cannot allocate framebuffer\n");
err = -ENOMEM;
goto err_release_mem;
}
@@ -125,7 +265,7 @@ static int __init efifb_probe(struct platform_device *dev)
"0x%x @ 0x%lx\n",
efifb_fix.smem_len, efifb_fix.smem_start);
err = -EIO;
- goto err_unmap;
+ goto err_release_fb;
}
printk(KERN_INFO "efifb: framebuffer at 0x%lx, mapped to 0x%p, "
@@ -178,25 +318,27 @@ static int __init efifb_probe(struct platform_device *dev)
info->fix = efifb_fix;
info->flags = FBINFO_FLAG_DEFAULT;
- if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
- err = -ENOMEM;
+ if ((err = fb_alloc_cmap(&info->cmap, 256, 0)) < 0) {
+ printk(KERN_ERR "efifb: cannot allocate colormap\n");
goto err_unmap;
}
- if (register_framebuffer(info) < 0) {
- err = -EINVAL;
+ if ((err = register_framebuffer(info)) < 0) {
+ printk(KERN_ERR "efifb: cannot register framebuffer\n");
goto err_fb_dealoc;
}
printk(KERN_INFO "fb%d: %s frame buffer device\n",
- info->node, info->fix.id);
+ info->node, info->fix.id);
return 0;
err_fb_dealoc:
fb_dealloc_cmap(&info->cmap);
err_unmap:
iounmap(info->screen_base);
+err_release_fb:
framebuffer_release(info);
err_release_mem:
- release_mem_region(efifb_fix.smem_start, size_total);
+ if (request_succeeded)
+ release_mem_region(efifb_fix.smem_start, size_total);
return err;
}
@@ -214,9 +356,22 @@ static struct platform_device efifb_device = {
static int __init efifb_init(void)
{
int ret;
+ char *option = NULL;
if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)
return -ENODEV;
+ dmi_check_system(dmi_system_table);
+
+ if (fb_get_options("efifb", &option))
+ return -ENODEV;
+ efifb_setup(option);
+
+ /* We don't get linelength from UGA Draw Protocol, only from
+ * EFI Graphics Protocol. So if it's not in DMI, and it's not
+ * passed in from the user, we really can't use the framebuffer.
+ */
+ if (!screen_info.lfb_linelength)
+ return -ENODEV;
ret = platform_driver_register(&efifb_driver);
diff --git a/drivers/video/imacfb.c b/drivers/video/imacfb.c
index 9366ef2..e69de29 100644
--- a/drivers/video/imacfb.c
+++ b/drivers/video/imacfb.c
@@ -1,376 +0,0 @@
-/*
- * framebuffer driver for Intel Based Mac's
- *
- * (c) 2006 Edgar Hucek <gimli at dark-green.com>
- * Original imac driver written by Gerd Knorr <kraxel at goldbach.in-berlin.de>
- *
- */
-
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/fb.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/ioport.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/screen_info.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/dmi.h>
-#include <linux/efi.h>
-
-#include <asm/io.h>
-
-#include <video/vga.h>
-
-typedef enum _MAC_TYPE {
- M_I17,
- M_I20,
- M_MINI,
- M_MACBOOK,
- M_UNKNOWN
-} MAC_TYPE;
-
-/* --------------------------------------------------------------------- */
-
-static struct fb_var_screeninfo imacfb_defined __initdata = {
- .activate = FB_ACTIVATE_NOW,
- .height = -1,
- .width = -1,
- .right_margin = 32,
- .upper_margin = 16,
- .lower_margin = 4,
- .vsync_len = 4,
- .vmode = FB_VMODE_NONINTERLACED,
-};
-
-static struct fb_fix_screeninfo imacfb_fix __initdata = {
- .id = "IMAC VGA",
- .type = FB_TYPE_PACKED_PIXELS,
- .accel = FB_ACCEL_NONE,
- .visual = FB_VISUAL_TRUECOLOR,
-};
-
-static int inverse;
-static int model = M_UNKNOWN;
-static int manual_height;
-static int manual_width;
-
-static int set_system(const struct dmi_system_id *id)
-{
- printk(KERN_INFO "imacfb: %s detected - set system to %ld\n",
- id->ident, (long)id->driver_data);
-
- model = (long)id->driver_data;
-
- return 0;
-}
-
-static struct dmi_system_id __initdata dmi_system_table[] = {
- { set_system, "iMac4,1", {
- DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME,"iMac4,1") }, (void*)M_I17},
- { set_system, "MacBookPro1,1", {
- DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro1,1") }, (void*)M_I17},
- { set_system, "MacBook1,1", {
- DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME,"MacBook1,1")}, (void *)M_MACBOOK},
- { set_system, "Macmini1,1", {
- DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME,"Macmini1,1")}, (void *)M_MINI},
- {},
-};
-
-#define DEFAULT_FB_MEM 1024*1024*16
-
-/* --------------------------------------------------------------------- */
-
-static int imacfb_setcolreg(unsigned regno, unsigned red, unsigned green,
- unsigned blue, unsigned transp,
- struct fb_info *info)
-{
- /*
- * Set a single color register. The values supplied are
- * already rounded down to the hardware's capabilities
- * (according to the entries in the `var' structure). Return
- * != 0 for invalid regno.
- */
-
- if (regno >= info->cmap.len)
- return 1;
-
- if (regno < 16) {
- red >>= 8;
- green >>= 8;
- blue >>= 8;
- ((u32 *)(info->pseudo_palette))[regno] =
- (red << info->var.red.offset) |
- (green << info->var.green.offset) |
- (blue << info->var.blue.offset);
- }
- return 0;
-}
-
-static struct fb_ops imacfb_ops = {
- .owner = THIS_MODULE,
- .fb_setcolreg = imacfb_setcolreg,
- .fb_fillrect = cfb_fillrect,
- .fb_copyarea = cfb_copyarea,
- .fb_imageblit = cfb_imageblit,
-};
-
-static int __init imacfb_setup(char *options)
-{
- char *this_opt;
-
- if (!options || !*options)
- return 0;
-
- while ((this_opt = strsep(&options, ",")) != NULL) {
- if (!*this_opt) continue;
-
- if (!strcmp(this_opt, "inverse"))
- inverse = 1;
- else if (!strcmp(this_opt, "i17"))
- model = M_I17;
- else if (!strcmp(this_opt, "i20"))
- model = M_I20;
- else if (!strcmp(this_opt, "mini"))
- model = M_MINI;
- else if (!strcmp(this_opt, "macbook"))
- model = M_MACBOOK;
- else if (!strncmp(this_opt, "height:", 7))
- manual_height = simple_strtoul(this_opt+7, NULL, 0);
- else if (!strncmp(this_opt, "width:", 6))
- manual_width = simple_strtoul(this_opt+6, NULL, 0);
- }
- return 0;
-}
-
-static int __init imacfb_probe(struct platform_device *dev)
-{
- struct fb_info *info;
- int err;
- unsigned int size_vmode;
- unsigned int size_remap;
- unsigned int size_total;
-
- screen_info.lfb_depth = 32;
- screen_info.lfb_size = DEFAULT_FB_MEM / 0x10000;
- screen_info.pages=1;
- screen_info.blue_size = 8;
- screen_info.blue_pos = 0;
- screen_info.green_size = 8;
- screen_info.green_pos = 8;
- screen_info.red_size = 8;
- screen_info.red_pos = 16;
- screen_info.rsvd_size = 8;
- screen_info.rsvd_pos = 24;
-
- switch (model) {
- case M_I17:
- screen_info.lfb_width = 1440;
- screen_info.lfb_height = 900;
- screen_info.lfb_linelength = 1472 * 4;
- screen_info.lfb_base = 0x80010000;
- break;
- case M_I20:
- screen_info.lfb_width = 1680;
- screen_info.lfb_height = 1050;
- screen_info.lfb_linelength = 1728 * 4;
- screen_info.lfb_base = 0x80010000;
- break;
- case M_MINI:
- screen_info.lfb_width = 1024;
- screen_info.lfb_height = 768;
- screen_info.lfb_linelength = 2048 * 4;
- screen_info.lfb_base = 0x80000000;
- break;
- case M_MACBOOK:
- screen_info.lfb_width = 1280;
- screen_info.lfb_height = 800;
- screen_info.lfb_linelength = 2048 * 4;
- screen_info.lfb_base = 0x80000000;
- break;
- }
-
- /* if the user wants to manually specify height/width,
- we will override the defaults */
- /* TODO: eventually get auto-detection working */
- if (manual_height > 0)
- screen_info.lfb_height = manual_height;
- if (manual_width > 0)
- screen_info.lfb_width = manual_width;
-
- imacfb_fix.smem_start = screen_info.lfb_base;
- imacfb_defined.bits_per_pixel = screen_info.lfb_depth;
- imacfb_defined.xres = screen_info.lfb_width;
- imacfb_defined.yres = screen_info.lfb_height;
- imacfb_fix.line_length = screen_info.lfb_linelength;
-
- /* size_vmode -- that is the amount of memory needed for the
- * used video mode, i.e. the minimum amount of
- * memory we need. */
- size_vmode = imacfb_defined.yres * imacfb_fix.line_length;
-
- /* size_total -- all video memory we have. Used for
- * entries, ressource allocation and bounds
- * checking. */
- size_total = screen_info.lfb_size * 65536;
- if (size_total < size_vmode)
- size_total = size_vmode;
-
- /* size_remap -- the amount of video memory we are going to
- * use for imacfb. With modern cards it is no
- * option to simply use size_total as that
- * wastes plenty of kernel address space. */
- size_remap = size_vmode * 2;
- if (size_remap < size_vmode)
- size_remap = size_vmode;
- if (size_remap > size_total)
- size_remap = size_total;
- imacfb_fix.smem_len = size_remap;
-
- if (!request_mem_region(imacfb_fix.smem_start, size_total, "imacfb")) {
- printk(KERN_WARNING
- "imacfb: cannot reserve video memory at 0x%lx\n",
- imacfb_fix.smem_start);
- /* We cannot make this fatal. Sometimes this comes from magic
- spaces our resource handlers simply don't know about */
- }
-
- info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev);
- if (!info) {
- err = -ENOMEM;
- goto err_release_mem;
- }
- info->pseudo_palette = info->par;
- info->par = NULL;
-
- info->screen_base = ioremap(imacfb_fix.smem_start, imacfb_fix.smem_len);
- if (!info->screen_base) {
- printk(KERN_ERR "imacfb: abort, cannot ioremap video memory "
- "0x%x @ 0x%lx\n",
- imacfb_fix.smem_len, imacfb_fix.smem_start);
- err = -EIO;
- goto err_unmap;
- }
-
- printk(KERN_INFO "imacfb: framebuffer at 0x%lx, mapped to 0x%p, "
- "using %dk, total %dk\n",
- imacfb_fix.smem_start, info->screen_base,
- size_remap/1024, size_total/1024);
- printk(KERN_INFO "imacfb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
- imacfb_defined.xres, imacfb_defined.yres,
- imacfb_defined.bits_per_pixel, imacfb_fix.line_length,
- screen_info.pages);
-
- imacfb_defined.xres_virtual = imacfb_defined.xres;
- imacfb_defined.yres_virtual = imacfb_fix.smem_len /
- imacfb_fix.line_length;
- printk(KERN_INFO "imacfb: scrolling: redraw\n");
- imacfb_defined.yres_virtual = imacfb_defined.yres;
-
- /* some dummy values for timing to make fbset happy */
- imacfb_defined.pixclock = 10000000 / imacfb_defined.xres *
- 1000 / imacfb_defined.yres;
- imacfb_defined.left_margin = (imacfb_defined.xres / 8) & 0xf8;
- imacfb_defined.hsync_len = (imacfb_defined.xres / 8) & 0xf8;
-
- imacfb_defined.red.offset = screen_info.red_pos;
- imacfb_defined.red.length = screen_info.red_size;
- imacfb_defined.green.offset = screen_info.green_pos;
- imacfb_defined.green.length = screen_info.green_size;
- imacfb_defined.blue.offset = screen_info.blue_pos;
- imacfb_defined.blue.length = screen_info.blue_size;
- imacfb_defined.transp.offset = screen_info.rsvd_pos;
- imacfb_defined.transp.length = screen_info.rsvd_size;
-
- printk(KERN_INFO "imacfb: %s: "
- "size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",
- "Truecolor",
- screen_info.rsvd_size,
- screen_info.red_size,
- screen_info.green_size,
- screen_info.blue_size,
- screen_info.rsvd_pos,
- screen_info.red_pos,
- screen_info.green_pos,
- screen_info.blue_pos);
-
- imacfb_fix.ypanstep = 0;
- imacfb_fix.ywrapstep = 0;
-
- /* request failure does not faze us, as vgacon probably has this
- * region already (FIXME) */
- request_region(0x3c0, 32, "imacfb");
-
- info->fbops = &imacfb_ops;
- info->var = imacfb_defined;
- info->fix = imacfb_fix;
- info->flags = FBINFO_FLAG_DEFAULT;
-
- if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
- err = -ENOMEM;
- goto err_unmap;
- }
- if (register_framebuffer(info)<0) {
- err = -EINVAL;
- goto err_fb_dealoc;
- }
- printk(KERN_INFO "fb%d: %s frame buffer device\n",
- info->node, info->fix.id);
- return 0;
-
-err_fb_dealoc:
- fb_dealloc_cmap(&info->cmap);
-err_unmap:
- iounmap(info->screen_base);
- framebuffer_release(info);
-err_release_mem:
- release_mem_region(imacfb_fix.smem_start, size_total);
- return err;
-}
-
-static struct platform_driver imacfb_driver = {
- .probe = imacfb_probe,
- .driver = {
- .name = "imacfb",
- },
-};
-
-static struct platform_device imacfb_device = {
- .name = "imacfb",
-};
-
-static int __init imacfb_init(void)
-{
- int ret;
- char *option = NULL;
-
- if (!efi_enabled)
- return -ENODEV;
- if (!dmi_check_system(dmi_system_table))
- return -ENODEV;
- if (model == M_UNKNOWN)
- return -ENODEV;
-
- if (fb_get_options("imacfb", &option))
- return -ENODEV;
-
- imacfb_setup(option);
- ret = platform_driver_register(&imacfb_driver);
-
- if (!ret) {
- ret = platform_device_register(&imacfb_device);
- if (ret)
- platform_driver_unregister(&imacfb_driver);
- }
- return ret;
-}
-module_init(imacfb_init);
-
-MODULE_LICENSE("GPL");
--- NEW FILE patch-2.6.25-rc8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBH8ph5yGugalF9Dw4RAkcYAJ9QV6DzpQeRuMzatBq2HMV+wLV2/ACdEHXz
/d4YN71jM1TPWXujlfsOERo=
=vlwU
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 1 Apr 2008 10:38:06 -0000 1.13
+++ .cvsignore 2 Apr 2008 08:55:25 -0000 1.14
@@ -4,6 +4,5 @@
temp-*
kernel-2.6.24
linux-2.6.24.tar.bz2
-patch-2.6.25-rc7.bz2
-patch-2.6.25-rc7-git6.bz2
+patch-2.6.25-rc8.bz2
xen-3.2.0.tar.gz
Index: .gitignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/.gitignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .gitignore 1 Apr 2008 10:38:06 -0000 1.3
+++ .gitignore 2 Apr 2008 08:55:25 -0000 1.4
@@ -4,7 +4,6 @@
temp-*
kernel-2.6.24
linux-2.6.24.tar.bz2
-patch-2.6.25-rc7.bz2
-patch-2.6.25-rc7-git6.bz2
+patch-2.6.25-rc8.bz2
xen-3.2.0.tar.gz
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-generic 1 Apr 2008 10:38:06 -0000 1.4
+++ config-generic 2 Apr 2008 08:55:25 -0000 1.5
@@ -1301,6 +1301,7 @@
CONFIG_LIBERTAS_SDIO=m
CONFIG_LIBERTAS_DEBUG=y
CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLCORE_RFKILL=y
CONFIG_IWL4965=m
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEBUGFS=y
Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-x86-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-x86-generic 6 Mar 2008 13:59:25 -0000 1.3
+++ config-x86-generic 2 Apr 2008 08:55:25 -0000 1.4
@@ -77,7 +77,7 @@
CONFIG_EFI=y
CONFIG_EFI_VARS=y
CONFIG_EFI_PCDP=y
-CONFIG_FB_IMAC=y
+CONFIG_FB_EFI=y
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GODIRECT is not set
Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-x86_64-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-x86_64-generic 1 Apr 2008 10:38:06 -0000 1.4
+++ config-x86_64-generic 2 Apr 2008 08:55:25 -0000 1.5
@@ -33,6 +33,7 @@
CONFIG_EFI=y
CONFIG_EFI_VARS=y
CONFIG_EFI_PCDP=y
+CONFIG_FB_EFI=y
CONFIG_I2O=m
CONFIG_I2O_BLOCK=m
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kernel.spec 1 Apr 2008 12:52:48 -0000 1.26
+++ kernel.spec 2 Apr 2008 08:55:25 -0000 1.27
@@ -43,9 +43,9 @@
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(expr %{base_sublevel} + 1)
# The rc snapshot level
-%define rcrev 7
+%define rcrev 8
# The git snapshot level
-%define gitrev 6
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -664,6 +664,9 @@
Patch2501: linux-2.6-ppc-use-libgcc.patch
+# get rid of imacfb and make efifb work everywhere it was used
+Patch2600: linux-2.6-merge-efifb-imacfb.patch
+
# kernel-xen patches start
Patch5000: linux-2.6-xen-0001-squashfs-Fix-build-without-CONFIG_SMP.patch
Patch5001: linux-2.6-xen-0002-xen-execshield-Add-xen-specific-load_user_cs_desc.patch
@@ -1050,7 +1053,9 @@
ApplyPatch linux-2.6-hotfixes.patch
# Roland's utrace ptrace replacement.
+%ifnarch ia64
ApplyPatch linux-2.6-utrace.patch
+%endif
# enable sysrq-c on all kernels, not only kexec
ApplyPatch linux-2.6-sysrq-c.patch
@@ -1204,15 +1209,18 @@
# linux1394 git patches
ApplyPatch linux-2.6-firewire-git-update.patch
C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-firewire-git-pending.patch
-fi
+#if [ "$C" -gt 10 ]; then
+#ApplyPatch linux-2.6-firewire-git-pending.patch
+#fi
# usb video
ApplyPatch linux-2.6-uvcvideo.patch
ApplyPatch linux-2.6-ppc-use-libgcc.patch
+# get rid of imacfb and make efifb work everywhere it was used
+ApplyPatch linux-2.6-merge-efifb-imacfb.patch
+
# ---------- below all scheduled for 2.6.24 -----------------
# kernel-xen apply start
@@ -1519,8 +1527,8 @@
cd %{xen_hv_dirname}/xen/
mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot
make %{?_smp_mflags} %{xen_flags}
- install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}xen
- install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}xen
+ install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}.xen
+ install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}.xen
cd ../..
%endif
%endif
@@ -1588,8 +1596,8 @@
%if %{includexen}
%if %{with_xen}
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
-rm -f $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf
-cat > $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf <<\EOF
+rm -f $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf
+cat > $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf <<\EOF
# This directive teaches ldconfig to search in nosegneg subdirectories
# and cache the DSOs there with extra bit 0 set in their hwcap match
# fields. In Xen guest kernels, the vDSO tells the dynamic linker to
@@ -1597,7 +1605,7 @@
# in the ld.so.cache file.
hwcap 0 nosegneg
EOF
-chmod 444 $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf
+chmod 444 $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf
%endif
%endif
@@ -1744,7 +1752,7 @@
%if %{with_xen}
%kernel_variant_preun xen
-%kernel_variant_post -v xen -s kernel-xen[0U] -r kernel-xen -- `[ -d /proc/xen -a ! -e /proc/xen/xsd_kva ] || echo --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}xen`
+%kernel_variant_post -v xen -s kernel-xen[0U] -r kernel-xen -- `[ -d /proc/xen -a ! -e /proc/xen/xsd_kva ] || echo --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}.xen`
if [ -x /sbin/ldconfig ]
then
/sbin/ldconfig -X || exit $?
@@ -1842,9 +1850,13 @@
%kernel_variant_files %{with_pae} PAE
%kernel_variant_files %{with_pae_debug} PAEdebug
%kernel_variant_files -k vmlinux %{with_kdump} kdump
-%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf %{with_xen} xen
+%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
%changelog
+* Wed Apr 2 2008 Mark McLoughlin <markmc at redhat.com>
+- Update to kernel-2.6.25-0.187.rc8.fc9
+- Use ".xen" suffix for some files instead of just "xen" (jwilson)
+
* Tue Apr 1 2008 Mark McLoughlin <markmc at redhat.com>
- Update to kernel-2_6_25-0_182_rc7_git6_fc9
- Fix oops when dlclose()ing some prelink libs (#436453)
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-wireless-pending.patch 1 Apr 2008 10:38:06 -0000 1.3
+++ linux-2.6-wireless-pending.patch 2 Apr 2008 08:55:25 -0000 1.4
@@ -1,3 +1,412 @@
+commit 06501d29ada4457349f4f4427bbf0bbb7c59b8f6
+Author: John W. Linville <linville at tuxdriver.com>
+Date: Tue Apr 1 17:38:47 2008 -0400
+
+ wireless: fix various printk warnings on ia64 (and others)
+
+ drivers/net/wireless/ath5k/base.c: In function `ath5k_check_ibss_tsf':
+ drivers/net/wireless/ath5k/base.c:1740: warning: long long unsigned int format, u64 arg (arg 5)
+ drivers/net/wireless/ath5k/base.c:1740: warning: long long unsigned int format, u64 arg (arg 6)
+ drivers/net/wireless/ath5k/base.c:1740: warning: long long int format, u64 arg (arg 7)
+ drivers/net/wireless/ath5k/base.c:1740: warning: long long unsigned int format, u64 arg (arg 8)
+ drivers/net/wireless/ath5k/base.c:1757: warning: long long unsigned int format, u64 arg (arg 5)
+ drivers/net/wireless/ath5k/base.c:1757: warning: long long unsigned int format, u64 arg (arg 6)
+ drivers/net/wireless/iwlwifi/iwl4965-base.c: In function `iwl4965_tx_status_reply_tx':
+ drivers/net/wireless/iwlwifi/iwl4965-base.c:3105: warning: long long unsigned int format, u64 arg (arg 6)
+ drivers/net/wireless/iwlwifi/iwl-4965.c: In function `iwl4965_rx_reply_rx':
+ drivers/net/wireless/iwlwifi/iwl-4965.c:3978: warning: long long unsigned int format, u64 arg (arg 7)
+
+ Cc: Andrew Morton <akpm at linux-foundation.org>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 6c4711b4697d93424e4b1f76a9929ba844d714a5
+Author: Luis Carlos Cobo <luisca at cozybit.com>
+Date: Mon Mar 31 17:39:18 2008 -0700
+
+ mac80211: use a struct for bss->mesh_config
+
+ This allows cleaner code when accesing bss->mesh_config components.
+
+ Signed-off-by: Luis Carlos Cobo <luisca at cozybit.com>
+ Acked-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 05e5e88373d91c75e9262a3f984be511960e510d
+Author: Luis Carlos Cobo <luisca at cozybit.com>
+Date: Mon Mar 31 16:00:13 2008 -0700
+
+ mac80211: check for mesh_config length on incoming management frames
+
+ Signed-off-by: Luis Carlos Cobo <luisca at cozybit.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 966a54282257ce1c43a5410dab2f2778a6f4dcf9
+Author: Luis Carlos Cobo <luisca at cozybit.com>
+Date: Mon Mar 31 15:33:39 2008 -0700
+
+ mac80211: use recent multicast table for all mesh multicast frames
+
+ ...not only broadcast.
+
+ Signed-off-by: Luis Carlos Cobo <luisca at cozybit.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit cb585bccfedab0c228344ffa258950c417dea6b5
+Author: Luis Carlos Cobo <luisca at cozybit.com>
+Date: Mon Mar 31 15:21:23 2008 -0700
+
+ mac80211: fix spinlock recursion on sta expiration
+
+ Signed-off-by: Luis Carlos Cobo <luisca at cozybit.com>
+ Acked-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 73bb3e4a7a9f1b8d5f89c3991bd0c904ab0b8e27
+Author: Luis Carlos Cobo <luisca at cozybit.com>
+Date: Mon Mar 31 15:10:22 2008 -0700
+
+ mac80211: fix deadlocks in debugfs_netdev.c
+
+ The bug shows up with CONFIG_PREEMPT enabled. Pointed out by Andrew Morton.
+
+ Cc: Andrew Morton <akpm at linux-foundation.org>
+ Cc: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: Luis Carlos Cobo <luisca at cozybit.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 7e879b551f1ada78d66fa5c6914aa1744b9c97d2
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date: Mon Mar 31 19:23:04 2008 +0200
+
+ mac80211: fix sparse complaint in ieee80211_sta_def_wmm_params
+
+ A variable 'i' is being shadowed by another one, but the second
+ one can just be removed.
+
+ Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+ Cc: Vladimir Koutny <vlado at work.ksp.sk>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit dc6676b7f2c2072ec05254aaca32e99f87a8a417
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date: Mon Mar 31 19:23:03 2008 +0200
+
+ mac80211: sta_info_flush() fixes
+
+ When the IBSS code tries to flush the STA list, it does so in
+ an atomic context. Flushing isn't safe there, however, and
+ requires the RTNL, so we need to defer it to a workqueue.
+
+ Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 4f6fab472c4c7c21d577f85fabec7628d4a05637
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date: Mon Mar 31 19:23:02 2008 +0200
+
+ mac80211: clean up sta_info_destroy() users wrt. RCU/locking
+
+ Calling sta_info_destroy() doesn't require RCU-synchronisation
+ before-hand because it does that internally. However, it does
+ require rtnl-locking so insert that where necessary.
+
+ Also clean up the code doing it internally to be a bit clearer and
+ not synchronize twice if keys are configured.
+
+ Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 93e5deb1ae39b56f4743955e76c72251256f23c1
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date: Tue Apr 1 15:21:00 2008 +0200
+
+ mac80211: automatically free sta struct when insertion fails
+
+ When STA structure insertion fails, it has been allocated but isn't
+ really alive yet, it isn't reachable by any other code and also can't
+ yet have much configured. This patch changes the code so that when
+ the insertion fails, the resulting STA pointer is no longer valid
+ because it is freed.
+
+ Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 97bff8ecf4e4e26749a67dcfbb7565d8a0f4acb4
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date: Mon Mar 31 19:23:00 2008 +0200
+
+ mac80211: fix sta_info_destroy(NULL)
+
+ sta_info_destroy(NULL) should be valid, but currently isn't because
+ the argument is dereferenced before the NULL check. There are no
+ users that currently pass in NULL, i.e. all check before calling the
+ function, but I want to change that.
+
+ Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 9dd6aed05b8859265cd79f1e47e4f844bbe1548b
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date: Mon Mar 31 19:22:59 2008 +0200
+
+ mac80211 ibss: flush only stations belonging to current interface
+
+ When joining a new IBSS, all old stations are flushed, but currently
+ all stations belonging to all virtual interfaces are flushed, which
+ is wrong. This patch fixes it.
+
+ Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit a2e1d52a32eab53f8ab03c4023310f65aaa054a7
+Author: Ivo van Doorn <ivdoorn at gmail.com>
+Date: Mon Mar 31 15:53:44 2008 +0200
+
+ rt2x00: Remove MAC80211_LEDS dependency
+
+ Implement triggers inside rt2x00 itself based
+ on input from mac80211. This replaces the method
+ of using the mac80211 trigger events which do
+ not work for USB drivers due to the scheduling
+ requirement.
+
+ After this patch RT2500USB_LEDS and RT73USB_LEDS
+ no longer need to be tagged as broken since they
+ now support LED handling again without having to
+ check for in_atomic().
+
+ Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit e0b005fa1479045fe879944036268af3ebcd1835
+Author: Ivo van Doorn <ivdoorn at gmail.com>
+Date: Mon Mar 31 15:24:53 2008 +0200
+
+ rt2x00: TO_DS filter depends on intf_ap_count
+
+ The TO_DS filter does not only depend on the FIF_PROMISC_IN_BSS flag
+ provided by mac80211, but also on the intf_ap_count count.
+ This makes sense, since when Master mode is active, we should all frames
+ that are send to the active AP (the device itself).
+
[...15518 lines suppressed...]
-+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig 2008-04-01 20:38:30.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-04-01 20:48:59.000000000 -0400
@@ -78,8 +78,9 @@ static void max2820_rf_set_channel(struc
struct ieee80211_conf *conf)
{
@@ -91159,8 +93014,8 @@
/* While philips SA2400 drive the PA bias from
diff -up linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.24.noarch/drivers/net/wireless/adm8211.c
---- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-03-28 10:30:43.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-04-01 20:38:28.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-04-01 20:48:59.000000000 -0400
@@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_
{ 0 }
};
@@ -91330,8 +93185,8 @@
err = ieee80211_register_hw(dev);
if (err) {
diff -up linux-2.6.24.noarch/drivers/ssb/Makefile.orig linux-2.6.24.noarch/drivers/ssb/Makefile
---- linux-2.6.24.noarch/drivers/ssb/Makefile.orig 2008-03-28 10:30:47.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/Makefile 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/Makefile.orig 2008-04-01 20:38:33.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/Makefile 2008-04-01 20:48:59.000000000 -0400
@@ -1,6 +1,7 @@
# core
ssb-y += main.o scan.o
@@ -91349,8 +93204,8 @@
# b43 pci-ssb-bridge driver
# Not strictly a part of SSB, but kept here for convenience
diff -up linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.24.noarch/drivers/ssb/pcmcia.c
---- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-03-28 10:30:47.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-04-01 20:38:33.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-04-01 20:48:59.000000000 -0400
@@ -3,7 +3,7 @@
* PCMCIA-Hostbus related functions
*
@@ -92023,8 +93878,8 @@
+ return err;
}
diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c
---- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-03-28 10:30:47.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-04-01 20:38:33.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-04-01 20:48:59.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/io.h>
#include <linux/ssb/ssb.h>
@@ -92163,7 +94018,7 @@
}
diff -up linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c
--- linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c.orig 2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c 2008-03-28 11:55:11.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c 2008-04-01 20:48:59.000000000 -0400
@@ -209,6 +209,7 @@ void ssb_mipscore_init(struct ssb_mipsco
/* fallthrough */
case SSB_DEV_PCI:
@@ -92173,8 +94028,8 @@
case SSB_DEV_USB20_HOST:
/* These devices get their own IRQ line if available, the rest goes on IRQ0 */
diff -up linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig linux-2.6.24.noarch/drivers/ssb/ssb_private.h
---- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig 2008-03-28 10:30:47.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig 2008-04-01 20:38:33.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h 2008-04-01 20:48:59.000000000 -0400
@@ -81,6 +81,7 @@ extern int ssb_pcmcia_switch_segment(str
u8 seg);
extern int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
@@ -92221,8 +94076,8 @@
/* b43_pci_bridge.c */
#ifdef CONFIG_SSB_B43_PCI_BRIDGE
diff -up /dev/null linux-2.6.24.noarch/drivers/ssb/driver_gige.c
---- /dev/null 2008-03-28 08:58:45.220448129 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_gige.c 2008-03-28 11:55:11.000000000 -0400
+--- /dev/null 2008-04-01 10:36:34.721293558 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_gige.c 2008-04-01 20:48:59.000000000 -0400
@@ -0,0 +1,294 @@
+/*
+ * Sonics Silicon Backplane
@@ -92519,8 +94374,8 @@
+ return ssb_driver_register(&ssb_gige_driver);
+}
diff -up linux-2.6.24.noarch/drivers/ssb/pci.c.orig linux-2.6.24.noarch/drivers/ssb/pci.c
---- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-03-28 10:30:47.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-04-01 20:38:33.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-04-01 20:48:59.000000000 -0400
@@ -227,7 +227,7 @@ static u8 ssb_sprom_crc(const u16 *sprom
return crc;
}
@@ -92737,8 +94592,8 @@
if (err)
goto out;
diff -up linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c
---- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-03-28 10:30:47.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-04-01 20:38:33.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-04-01 20:48:59.000000000 -0400
@@ -353,6 +353,16 @@ void ssb_chipco_watchdog_timer_set(struc
chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
}
@@ -92757,8 +94612,8 @@
{
return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask;
diff -up linux-2.6.24.noarch/drivers/ssb/Kconfig.orig linux-2.6.24.noarch/drivers/ssb/Kconfig
---- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig 2008-03-28 10:30:47.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/Kconfig 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig 2008-04-01 20:38:33.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/Kconfig 2008-04-01 20:48:59.000000000 -0400
@@ -20,6 +20,10 @@ config SSB
If unsure, say N.
@@ -92801,8 +94656,8 @@
+
endmenu
diff -up linux-2.6.24.noarch/drivers/ssb/embedded.c.orig linux-2.6.24.noarch/drivers/ssb/embedded.c
---- linux-2.6.24.noarch/drivers/ssb/embedded.c.orig 2008-03-28 10:30:47.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/embedded.c 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/embedded.c.orig 2008-04-01 20:38:33.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/embedded.c 2008-04-01 20:48:59.000000000 -0400
@@ -10,6 +10,9 @@
#include <linux/ssb/ssb.h>
@@ -92905,8 +94760,8 @@
+ return -ENODEV;
+}
diff -up linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c
---- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig 2008-03-28 10:30:47.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig 2008-04-01 20:38:33.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-04-01 20:48:59.000000000 -0400
@@ -60,77 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock);
/* Core to access the external PCI config space. Can only have one. */
static struct ssb_pcicore *extpci_core;
@@ -93082,8 +94937,8 @@
{
u32 val;
diff -up /dev/null linux-2.6.24.noarch/drivers/ssb/sprom.c
---- /dev/null 2008-03-28 08:58:45.220448129 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/sprom.c 2008-03-28 11:55:11.000000000 -0400
+--- /dev/null 2008-04-01 10:36:34.721293558 -0400
++++ linux-2.6.24.noarch/drivers/ssb/sprom.c 2008-04-01 20:48:59.000000000 -0400
@@ -0,0 +1,133 @@
+/*
+ * Sonics Silicon Backplane
@@ -93219,8 +95074,8 @@
+ return err ? err : count;
+}
diff -up linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt
---- linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig 2008-03-28 10:30:27.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig 2008-04-01 20:38:03.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt 2008-04-01 20:48:59.000000000 -0400
@@ -80,7 +80,7 @@ once you enable the radio, will depend o
e.g. With the BCM4318 on the Acer Aspire 5020 series:
@@ -93232,7 +95087,7 @@
acer-wmi come with built-in wireless. However, should you feel so inclined to
diff -up linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt
--- linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig 2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt 2008-03-28 11:55:11.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt 2008-04-01 20:48:59.000000000 -0400
@@ -1,89 +0,0 @@
-
- BCM43xx Linux Driver Project
@@ -93324,8 +95179,8 @@
-and CONFIG_IEEE80211_SOFTMAC_DEBUG. The log information provided is
-essential for solving any problems.
diff -up /dev/null linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl
---- /dev/null 2008-03-28 08:58:45.220448129 -0400
-+++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl 2008-03-28 11:55:11.000000000 -0400
+--- /dev/null 2008-04-01 10:36:34.721293558 -0400
++++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl 2008-04-01 20:48:59.000000000 -0400
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
@@ -93663,8 +95518,8 @@
+ </part>
+</book>
diff -up linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig linux-2.6.24.noarch/Documentation/DocBook/Makefile
---- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig 2008-03-28 11:53:57.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/DocBook/Makefile 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig 2008-04-01 20:48:01.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/DocBook/Makefile 2008-04-01 20:48:59.000000000 -0400
@@ -11,7 +11,8 @@ DOCBOOKS := wanbook.xml z8530book.xml mc
procfs-guide.xml writing_usb_driver.xml networking.xml \
kernel-api.xml filesystems.xml lsm.xml usb.xml \
@@ -93676,8 +95531,8 @@
###
# The build process is as follows (targets):
diff -up linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt
---- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig 2008-03-28 10:30:27.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt 2008-03-28 11:55:11.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig 2008-04-01 20:38:03.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt 2008-04-01 20:48:59.000000000 -0400
@@ -230,33 +230,6 @@ Who: Jean Delvare <khali at linux-fr.org>
---------------------------
linux-2.6-wireless.patch:
Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-wireless.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-wireless.patch 1 Apr 2008 10:38:07 -0000 1.4
+++ linux-2.6-wireless.patch 2 Apr 2008 08:55:25 -0000 1.5
@@ -1,3 +1,61 @@
+commit d43c7b37ad787173d08683f05eadeea0398fefdf
+Author: Vladimir Koutny <vlado at work.ksp.sk>
+Date: Mon Mar 31 17:05:03 2008 +0200
+
+ mac80211: correct use_short_preamble handling
+
+ ERP IE bit for preamble mode is 0 for short and 1 for long, not the other
+ way around. This fixes the value reported to the driver via
+ bss_conf->use_short_preamble field.
+
+ Signed-off-by: Vladimir Koutny <vlado at ksp.sk>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit e645890115004fa6c4dd1f9541bb834970c8bcae
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Fri Mar 28 11:48:53 2008 +0100
+
+ b43: Fix PCMCIA IRQ routing
+
+ This fixes the IRQ routing on PCMCIA devices.
+ With this patch the card will finally be able to receive IRQs.
+
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 539e6f8cffe9299fbf813ad574535b90ac370031
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Fri Mar 28 11:46:58 2008 +0100
+
+ b43: Add DMA mapping failure messages
+
+ This adds messages for some DMA mapping failures.
+ These are useful for debugging DMA address problems, as they appear
+ on x86_64 machines with IOMMU enabled.
+
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 64f851e410ae37a0990212ae34f0c96b641478f7
+Author: Jan Niehusmann <jan at gondor.com>
+Date: Sun Mar 23 20:23:56 2008 +0100
+
+ mac80211: trigger ieee80211_sta_work after opening interface
+
+ ieee80211_sta_work is disabled while network interface
+ is down. Therefore, if you configure wireless parameters
+ before bringing the interface up, these configurations are
+ not yet effective and association fails.
+
+ A workaround from userspace is calling a command like
+ 'iwconfig wlan0 ap any' after the interface is brought up.
+
+ To fix this behaviour, trigger execution of ieee80211_sta_work from
+ ieee80211_open when in STA or IBSS mode.
+
+ Signed-off-by: Jan Niehusmann <jan at gondor.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
commit 3e05e6703fb663fb8a394615d16c3a93cbef001e
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Thu Mar 27 17:15:24 2008 +0100
@@ -66,9 +124,111 @@
Acked-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
+diff -up linux-2.6.24.noarch/net/mac80211/ieee80211.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211.c
+--- linux-2.6.24.noarch/net/mac80211/ieee80211.c.orig 2008-04-01 20:39:01.000000000 -0400
++++ linux-2.6.24.noarch/net/mac80211/ieee80211.c 2008-04-01 20:41:26.000000000 -0400
+@@ -375,6 +375,18 @@ static int ieee80211_open(struct net_dev
+ if (need_hw_reconfig)
+ ieee80211_hw_config(local);
+
++ /*
++ * ieee80211_sta_work is disabled while network interface
++ * is down. Therefore, some configuration changes may not
++ * yet be effective. Trigger execution of ieee80211_sta_work
++ * to fix this.
++ */
++ if(sdata->vif.type == IEEE80211_IF_TYPE_STA ||
++ sdata->vif.type == IEEE80211_IF_TYPE_IBSS) {
++ struct ieee80211_if_sta *ifsta = &sdata->u.sta;
++ queue_work(local->hw.workqueue, &ifsta->work);
++ }
++
+ netif_start_queue(dev);
+
+ return 0;
+diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c
+--- linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig 2008-04-01 20:39:01.000000000 -0400
++++ linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c 2008-04-01 20:41:26.000000000 -0400
+@@ -360,7 +360,7 @@ static u32 ieee80211_handle_erp_ie(struc
+ struct ieee80211_bss_conf *bss_conf = &sdata->bss_conf;
+ struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+ bool use_protection = (erp_value & WLAN_ERP_USE_PROTECTION) != 0;
+- bool preamble_mode = (erp_value & WLAN_ERP_BARKER_PREAMBLE) != 0;
++ bool use_short_preamble = (erp_value & WLAN_ERP_BARKER_PREAMBLE) == 0;
+ DECLARE_MAC_BUF(mac);
+ u32 changed = 0;
+
+@@ -376,16 +376,15 @@ static u32 ieee80211_handle_erp_ie(struc
+ changed |= BSS_CHANGED_ERP_CTS_PROT;
+ }
+
+- if (preamble_mode != bss_conf->use_short_preamble) {
++ if (use_short_preamble != bss_conf->use_short_preamble) {
+ if (net_ratelimit()) {
+ printk(KERN_DEBUG "%s: switched to %s barker preamble"
+ " (BSSID=%s)\n",
+ sdata->dev->name,
+- (preamble_mode == WLAN_ERP_PREAMBLE_SHORT) ?
+- "short" : "long",
++ use_short_preamble ? "short" : "long",
+ print_mac(mac, ifsta->bssid));
+ }
+- bss_conf->use_short_preamble = preamble_mode;
++ bss_conf->use_short_preamble = use_short_preamble;
+ changed |= BSS_CHANGED_ERP_PREAMBLE;
+ }
+
+diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/pcmcia.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43/pcmcia.c
+--- linux-2.6.24.noarch/drivers/net/wireless/b43/pcmcia.c.orig 2008-01-24 17:58:37.000000000 -0500
++++ linux-2.6.24.noarch/drivers/net/wireless/b43/pcmcia.c 2008-04-01 20:41:26.000000000 -0400
+@@ -91,6 +91,8 @@ static int __devinit b43_pcmcia_probe(st
+
+ dev->conf.ConfigBase = parse.config.base;
+ dev->conf.Present = parse.config.rmask[0];
++ dev->conf.Attributes = CONF_ENABLE_IRQ;
++ dev->conf.IntType = INT_MEMORY_AND_IO;
+
+ dev->io.BasePort2 = 0;
+ dev->io.NumPorts2 = 0;
+@@ -112,8 +114,8 @@ static int __devinit b43_pcmcia_probe(st
+ if (res != CS_SUCCESS)
+ goto err_disable;
+
+- dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FIRST_SHARED;
+- dev->irq.IRQInfo1 = IRQ_LEVEL_ID | IRQ_SHARE_ID;
++ dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
++ dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
+ dev->irq.Handler = NULL; /* The handler is registered later. */
+ dev->irq.Instance = NULL;
+ res = pcmcia_request_irq(dev, &dev->irq);
+diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/dma.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43/dma.c
+--- linux-2.6.24.noarch/drivers/net/wireless/b43/dma.c.orig 2008-04-01 20:39:01.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/b43/dma.c 2008-04-01 20:41:26.000000000 -0400
+@@ -574,6 +574,7 @@ static int setup_rx_descbuffer(struct b4
+ }
+
+ if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) {
++ b43err(ring->dev->wl, "RX DMA buffer allocation failed\n");
+ dev_kfree_skb_any(skb);
+ return -EIO;
+ }
+@@ -829,8 +830,12 @@ struct b43_dmaring *b43_setup_dmaring(st
+ DMA_TO_DEVICE);
+
+ if (b43_dma_mapping_error(ring, dma_test,
+- b43_txhdr_size(dev), 1))
++ b43_txhdr_size(dev), 1)) {
++
++ b43err(dev->wl,
++ "TXHDR DMA allocation failed\n");
+ goto err_kfree_txhdr_cache;
++ }
+ }
+
+ dma_unmap_single(dev->dev->dev,
diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/if_cs.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/if_cs.c
---- linux-2.6.24.noarch/drivers/net/wireless/libertas/if_cs.c.orig 2008-03-28 12:22:08.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/if_cs.c 2008-03-28 15:17:08.000000000 -0400
+--- linux-2.6.24.noarch/drivers/net/wireless/libertas/if_cs.c.orig 2008-04-01 20:40:36.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/if_cs.c 2008-04-01 20:40:41.000000000 -0400
@@ -677,9 +677,7 @@ sbi_get_int_status_exit:
/* Card has a command result for us */
@@ -80,9 +240,9 @@
lbs_pr_err("could not receive cmd from card\n");
}
diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c
---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig 2008-03-28 12:22:07.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2008-03-28 15:17:08.000000000 -0400
-@@ -4589,7 +4589,7 @@ static u8 iwl4965_is_fat_tx_allowed(stru
+--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig 2008-04-01 20:40:36.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2008-04-01 20:40:41.000000000 -0400
+@@ -4602,7 +4602,7 @@ static u8 iwl4965_is_fat_tx_allowed(stru
if (sta_ht_inf) {
if ((!sta_ht_inf->ht_supported) ||
@@ -92,9 +252,9 @@
}
diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c
---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2008-03-28 12:22:08.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-03-28 15:17:08.000000000 -0400
-@@ -1393,11 +1393,20 @@ int rt2x00lib_suspend(struct rt2x00_dev
+--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2008-04-01 20:40:36.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-04-01 20:40:41.000000000 -0400
+@@ -1246,11 +1246,20 @@ int rt2x00lib_suspend(struct rt2x00_dev
exit:
/*
linux-2.6-xen-0001-squashfs-Fix-build-without-CONFIG_SMP.patch:
Index: linux-2.6-xen-0001-squashfs-Fix-build-without-CONFIG_SMP.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0001-squashfs-Fix-build-without-CONFIG_SMP.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-0001-squashfs-Fix-build-without-CONFIG_SMP.patch 1 Apr 2008 10:38:07 -0000 1.2
+++ linux-2.6-xen-0001-squashfs-Fix-build-without-CONFIG_SMP.patch 2 Apr 2008 08:55:25 -0000 1.3
@@ -1,4 +1,4 @@
-From d457f50be47bb436a599002edc3b4e30cf2c14bc Mon Sep 17 00:00:00 2001
+From 1d5b5063535d9dea4f8d6e1187307340e5cb3f18 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Wed, 5 Mar 2008 12:50:50 +0000
Subject: [PATCH] squashfs: Fix build without CONFIG_SMP
linux-2.6-xen-0002-xen-execshield-Add-xen-specific-load_user_cs_desc.patch:
Index: linux-2.6-xen-0002-xen-execshield-Add-xen-specific-load_user_cs_desc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0002-xen-execshield-Add-xen-specific-load_user_cs_desc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-0002-xen-execshield-Add-xen-specific-load_user_cs_desc.patch 1 Apr 2008 10:38:07 -0000 1.2
+++ linux-2.6-xen-0002-xen-execshield-Add-xen-specific-load_user_cs_desc.patch 2 Apr 2008 08:55:25 -0000 1.3
@@ -1,4 +1,4 @@
-From 9c0cd1ce681ec0d72901800b84f36aeebbe52bd0 Mon Sep 17 00:00:00 2001
+From de1c16fdd748780230528b4e37016e7a4b61a5c1 Mon Sep 17 00:00:00 2001
From: Stephen Tweedie <sct at redhat.com>
Date: Tue, 11 Mar 2008 18:05:30 +0000
Subject: [PATCH] xen execshield: Add xen-specific load_user_cs_desc()
linux-2.6-xen-0003-xen-execshield-fix-endless-GPF-fault-loop.patch:
Index: linux-2.6-xen-0003-xen-execshield-fix-endless-GPF-fault-loop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0003-xen-execshield-fix-endless-GPF-fault-loop.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-0003-xen-execshield-fix-endless-GPF-fault-loop.patch 1 Apr 2008 10:38:07 -0000 1.2
+++ linux-2.6-xen-0003-xen-execshield-fix-endless-GPF-fault-loop.patch 2 Apr 2008 08:55:25 -0000 1.3
@@ -1,4 +1,4 @@
-From 8e103bc888701246a9f561818c34b1e0962748f6 Mon Sep 17 00:00:00 2001
+From b79077414e4f8f32d6418cacebc48043d5abc2ab Mon Sep 17 00:00:00 2001
From: Stephen Tweedie <sct at redhat.com>
Date: Tue, 11 Mar 2008 18:07:31 +0000
Subject: [PATCH] xen execshield: fix endless GPF fault loop
linux-2.6-xen-0004-xen-Do-not-pin-unpin-PMD-pages.patch:
Index: linux-2.6-xen-0004-xen-Do-not-pin-unpin-PMD-pages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0004-xen-Do-not-pin-unpin-PMD-pages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-xen-0004-xen-Do-not-pin-unpin-PMD-pages.patch 1 Apr 2008 10:38:07 -0000 1.1
+++ linux-2.6-xen-0004-xen-Do-not-pin-unpin-PMD-pages.patch 2 Apr 2008 08:55:25 -0000 1.2
@@ -1,4 +1,4 @@
-From 80358c19beb40110031f9e0f68db37bfceb6b6d4 Mon Sep 17 00:00:00 2001
+From a0c0ff369a88be71c0e5d416a4f50c744bd45fda Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 28 Mar 2008 14:40:38 +0000
Subject: [PATCH] xen: Do not pin/unpin PMD pages
linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch:
Index: linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch 1 Apr 2008 10:38:07 -0000 1.3
+++ linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch 2 Apr 2008 08:55:25 -0000 1.4
@@ -1,4 +1,4 @@
-From ee6b3c4793587143d2a88dbbcae7d6119c7d1248 Mon Sep 17 00:00:00 2001
+From 778865b54156e114c42b212f59e44f19babf1dff Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru at redhat.com>
Date: Mon, 25 Feb 2008 14:02:24 +0100
Subject: [PATCH] xen: Make xen-blkfront write its protocol ABI to xenstore
linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch:
Index: linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch 1 Apr 2008 10:38:07 -0000 1.4
+++ linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch 2 Apr 2008 08:55:25 -0000 1.5
@@ -1,4 +1,4 @@
-From 0a831ce74b5f19e615fe9756afa06af6c5226e94 Mon Sep 17 00:00:00 2001
+From cc4334d03d4cb924236d4fd24c670ee8c81484ce Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru at redhat.com>
Date: Mon, 25 Feb 2008 14:06:46 +0100
Subject: [PATCH] xen pvfb: Para-virtual framebuffer, keyboard and pointer driver
@@ -407,10 +407,10 @@
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
-index 1bd5fb3..e3dc8f8 100644
+index 474c375..fa65342 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
-@@ -1930,6 +1930,20 @@ config FB_VIRTUAL
+@@ -1921,6 +1921,20 @@ config FB_VIRTUAL
If unsure, say N.
@@ -432,7 +432,7 @@
source "drivers/video/backlight/Kconfig"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
-index 11c0e5e..f172b9b 100644
+index c789b01..48f7fd3 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -114,6 +114,7 @@ obj-$(CONFIG_FB_PS3) += ps3fb.o
linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch:
Index: linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch 1 Apr 2008 10:38:07 -0000 1.4
+++ linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch 2 Apr 2008 08:55:25 -0000 1.5
@@ -1,4 +1,4 @@
-From 39e9d001b6bc96cf01e7957ec8f0266237239473 Mon Sep 17 00:00:00 2001
+From 3af0d72f7141cb75ae0fa37e95482453f2a6b914 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 22 Feb 2008 12:42:52 +0000
Subject: [PATCH] xen: Module autoprobing support for frontend drivers
linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch:
Index: linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch 1 Apr 2008 10:38:07 -0000 1.4
+++ linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch 2 Apr 2008 08:55:25 -0000 1.5
@@ -1,4 +1,4 @@
-From e0a0e15328d21827da1734778ed89fa31a83d217 Mon Sep 17 00:00:00 2001
+From 0d332af75e539e7653d6e27f7ded7785c90f2f69 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 21 Feb 2008 11:13:12 +0000
Subject: [PATCH] xen: Add compatibility aliases for frontend drivers
linux-2.6-xen-0009-xen-blkfront-Delay-wait-for-block-devices-until-aft.patch:
Index: linux-2.6-xen-0009-xen-blkfront-Delay-wait-for-block-devices-until-aft.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0009-xen-blkfront-Delay-wait-for-block-devices-until-aft.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-xen-0009-xen-blkfront-Delay-wait-for-block-devices-until-aft.patch 1 Apr 2008 10:38:07 -0000 1.3
+++ linux-2.6-xen-0009-xen-blkfront-Delay-wait-for-block-devices-until-aft.patch 2 Apr 2008 08:55:25 -0000 1.4
@@ -1,4 +1,4 @@
-From 4dabd728abdcdec2d9e1c1c7177479c03d8b5782 Mon Sep 17 00:00:00 2001
+From 085b2e96519e97bea75b871f6aada13362b9933e Mon Sep 17 00:00:00 2001
From: Christian Limpach <Christian.Limpach at xensource.com>
Date: Wed, 19 Mar 2008 15:54:48 +0000
Subject: [PATCH] xen blkfront: Delay wait for block devices until after the disk is added.
linux-2.6-xen-0010-xen-Add-a-vmlinuz-target.patch:
Index: linux-2.6-xen-0010-xen-Add-a-vmlinuz-target.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0010-xen-Add-a-vmlinuz-target.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-xen-0010-xen-Add-a-vmlinuz-target.patch 1 Apr 2008 10:38:07 -0000 1.3
+++ linux-2.6-xen-0010-xen-Add-a-vmlinuz-target.patch 2 Apr 2008 08:55:25 -0000 1.4
@@ -1,4 +1,4 @@
-From bbb538981bce7a062c4b47f38b7633295015be83 Mon Sep 17 00:00:00 2001
+From c587b35bc656098a23057bed9997b1d29037b971 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Tue, 19 Feb 2008 15:34:32 +0000
Subject: [PATCH] xen: Add a vmlinuz target
linux-2.6-xen-0011-xen-Add-empty-xenctrl-module.patch:
Index: linux-2.6-xen-0011-xen-Add-empty-xenctrl-module.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0011-xen-Add-empty-xenctrl-module.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-xen-0011-xen-Add-empty-xenctrl-module.patch 1 Apr 2008 10:38:07 -0000 1.3
+++ linux-2.6-xen-0011-xen-Add-empty-xenctrl-module.patch 2 Apr 2008 08:55:25 -0000 1.4
@@ -1,4 +1,4 @@
-From 2e3248aaf569ff7e3ab2bc77f1414ac015d2c16c Mon Sep 17 00:00:00 2001
+From 247e9cfd3c13c68e0ff177bcb3706d7c6feb749b Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Mon, 4 Feb 2008 08:30:37 +0000
Subject: [PATCH] xen: Add empty xenctrl module
linux-2.6-xen-0012-xen-Add-proc-xen-capabilities.patch:
Index: linux-2.6-xen-0012-xen-Add-proc-xen-capabilities.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0012-xen-Add-proc-xen-capabilities.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-xen-0012-xen-Add-proc-xen-capabilities.patch 1 Apr 2008 10:38:07 -0000 1.3
+++ linux-2.6-xen-0012-xen-Add-proc-xen-capabilities.patch 2 Apr 2008 08:55:25 -0000 1.4
@@ -1,4 +1,4 @@
-From 4303f417760f888d8afed5fd87aa76b3ec198a83 Mon Sep 17 00:00:00 2001
+From e9b105d24bde9e175f6ec288af8483376a1451ae Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Mon, 4 Feb 2008 09:16:51 +0000
Subject: [PATCH] xen: Add /proc/xen/capabilities
linux-2.6-xen-0013-xen-Add-proc-xen-privcmd.patch:
Index: linux-2.6-xen-0013-xen-Add-proc-xen-privcmd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0013-xen-Add-proc-xen-privcmd.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-xen-0013-xen-Add-proc-xen-privcmd.patch 1 Apr 2008 10:38:07 -0000 1.3
+++ linux-2.6-xen-0013-xen-Add-proc-xen-privcmd.patch 2 Apr 2008 08:55:25 -0000 1.4
@@ -1,4 +1,4 @@
-From 6baf8f598c8d00216eb1ff03f3fba9706496e447 Mon Sep 17 00:00:00 2001
+From 92154c47c81fcb8b5d5dcd17d2bdac5fe7db558a Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Mon, 4 Feb 2008 08:24:57 +0000
Subject: [PATCH] xen: Add /proc/xen/privcmd
linux-2.6-xen-0014-xen-Add-proc-xen-xenbus.patch:
Index: linux-2.6-xen-0014-xen-Add-proc-xen-xenbus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0014-xen-Add-proc-xen-xenbus.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-xen-0014-xen-Add-proc-xen-xenbus.patch 1 Apr 2008 10:38:07 -0000 1.3
+++ linux-2.6-xen-0014-xen-Add-proc-xen-xenbus.patch 2 Apr 2008 08:55:25 -0000 1.4
@@ -1,4 +1,4 @@
-From 281e15a7f51ebd1e547199fd5583c1d68b3cf49b Mon Sep 17 00:00:00 2001
+From 4470f9c801ea8817f9fadd40f7179e5d05722a33 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Mon, 4 Feb 2008 22:04:36 +0000
Subject: [PATCH] xen: Add /proc/xen/xenbus
linux-2.6-xen-0015-xen-Add-Xen-s-sys-hypervisor-interface.patch:
Index: linux-2.6-xen-0015-xen-Add-Xen-s-sys-hypervisor-interface.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0015-xen-Add-Xen-s-sys-hypervisor-interface.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-xen-0015-xen-Add-Xen-s-sys-hypervisor-interface.patch 1 Apr 2008 10:38:07 -0000 1.3
+++ linux-2.6-xen-0015-xen-Add-Xen-s-sys-hypervisor-interface.patch 2 Apr 2008 08:55:25 -0000 1.4
@@ -1,4 +1,4 @@
-From 97f74781644be0af74aedcd86f064c508c2db9c3 Mon Sep 17 00:00:00 2001
+From b1bfe3ddf28433a48502b432ed613d9dc0fb02a7 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 7 Feb 2008 15:32:28 +0000
Subject: [PATCH] xen: Add Xen's /sys/hypervisor interface
linux-2.6-xen-0016-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch:
Index: linux-2.6-xen-0016-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0016-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-xen-0016-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch 1 Apr 2008 10:38:07 -0000 1.3
+++ linux-2.6-xen-0016-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch 2 Apr 2008 08:55:25 -0000 1.4
@@ -1,4 +1,4 @@
-From a750b42db7d287c4931bb8fd3572f3c5cebc5497 Mon Sep 17 00:00:00 2001
+From f3113ec69963f768828100d404942b85377c30f1 Mon Sep 17 00:00:00 2001
From: Stephen Tweedie <sct at redhat.com>
Date: Wed, 21 Nov 2007 18:40:31 +0000
Subject: [PATCH] xen debug: Add xprintk to log directly via hypercall
linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch:
Index: linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch 1 Apr 2008 10:38:07 -0000 1.4
+++ linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch 2 Apr 2008 08:55:25 -0000 1.5
@@ -1,4 +1,4 @@
-From b50f268c17ea1835c761aff20a23c0d34ce73a43 Mon Sep 17 00:00:00 2001
+From 6fcfadcc705139925597308fb5269fa90436c7c0 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 6 Mar 2008 11:10:59 +0000
Subject: [PATCH] xen x86_64: Add 64 bit version of privcmd_hypercall()
linux-2.6-xen-0018-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch:
Index: linux-2.6-xen-0018-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0018-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-xen-0018-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch 1 Apr 2008 10:38:07 -0000 1.1
+++ linux-2.6-xen-0018-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch 2 Apr 2008 08:55:25 -0000 1.2
@@ -1,4 +1,4 @@
-From 24b23b3a992388dcaa3a08361f0dab15b7385802 Mon Sep 17 00:00:00 2001
+From 16e89fea775d56f283b50c17e877a410b08e2cf0 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Tue, 25 Mar 2008 11:56:43 +0000
Subject: [PATCH] xen x86_64: Only define load_user_cs_desc() on 32 bit
linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch:
Index: linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch 1 Apr 2008 13:07:21 -0000 1.3
+++ linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch 2 Apr 2008 08:55:25 -0000 1.4
@@ -1,4 +1,4 @@
-From 880992833dbeb5d6b97cf0aeb6993e3eef2df045 Mon Sep 17 00:00:00 2001
+From 3cee1d0011cc4736580b143163d579dffa43866c Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Thu, 28 Feb 2008 12:16:04 -0300
Subject: [PATCH] xen x86_64: Initial x86_64 support for Xen paravirt_ops
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 1 Apr 2008 10:38:07 -0000 1.13
+++ sources 2 Apr 2008 08:55:25 -0000 1.14
@@ -1,4 +1,3 @@
3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2
-942182dbe41b74c95bfa46fcba5ca8ec patch-2.6.25-rc7.bz2
-0c878963c9eecb8d841480414f12aaa8 patch-2.6.25-rc7-git6.bz2
+ef38a1bf38d8ddb2629d9b8c2a0fa662 patch-2.6.25-rc8.bz2
4aa57328d0802a063fa67dfc063da30e xen-3.2.0.tar.gz
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/upstream,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- upstream 1 Apr 2008 10:38:07 -0000 1.3
+++ upstream 2 Apr 2008 08:55:25 -0000 1.4
@@ -1,3 +1,2 @@
linux-2.6.24.tar.bz2
-patch-2.6.25-rc7.bz2
-patch-2.6.25-rc7-git6.bz2
+patch-2.6.25-rc8.bz2
--- patch-2.6.25-rc7-git6.bz2.sign DELETED ---
--- patch-2.6.25-rc7.bz2.sign DELETED ---
More information about the fedora-extras-commits
mailing list