[kernel] r11055 - in dists/trunk/linux-2.6/debian/patches: bugfix/all series
Maximilian Attems
maks at alioth.debian.org
Mon Apr 7 09:04:31 UTC 2008
Author: maks
Date: Mon Apr 7 09:04:30 2008
New Revision: 11055
Log:
update to 2.6.25-rc8-git5
no new conflicts, dvb + various fixes
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git5
- copied, changed from r11054, /dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git4
Removed:
dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git4
Modified:
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Copied: dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git5 (from r11054, /dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git4)
==============================================================================
--- /dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git4 (original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git5 Mon Apr 7 09:04:30 2008
@@ -16954,6 +16954,25 @@
}
void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t orig)
+diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
+index 027e5c0..170d2f5 100644
+--- a/arch/x86/kernel/cpu/bugs.c
++++ b/arch/x86/kernel/cpu/bugs.c
+@@ -143,14 +143,6 @@ static void __init check_config(void)
+ #endif
+
+ /*
+- * If we configured ourselves for a TSC, we'd better have one!
+- */
+-#ifdef CONFIG_X86_TSC
+- if (!cpu_has_tsc)
+- panic("Kernel compiled for Pentium+, requires TSC feature!");
+-#endif
+-
+-/*
+ * If we were told we had a good local APIC, check for buggy Pentia,
+ * i.e. all B steppings and the C2 stepping of P54C when using their
+ * integrated APIC (see 11AP erratum in "Pentium Processor
diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
index 9b83832..b943e10 100644
--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -17435,6 +17454,19 @@
return 0;
}
+diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
+index 12fb44f..980a741 100644
+--- a/drivers/acpi/video.c
++++ b/drivers/acpi/video.c
+@@ -713,7 +713,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
+
+ kfree(obj);
+
+- if (device->cap._BCL && device->cap._BCM && max_level > 0) {
++ if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){
+ int result;
+ static int count = 0;
+ char *name;
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 4851988..be95fdb 100644
--- a/drivers/ata/libata-core.c
@@ -17690,6 +17722,21 @@
/* Allow interception of SIGKILL only
* Don't allow other signals to interrupt the transmission */
siginitsetinv(&blocked, sigmask(SIGKILL));
+diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
+index c10d128..675d88b 100644
+--- a/drivers/char/drm/i915_drv.h
++++ b/drivers/char/drm/i915_drv.h
+@@ -1092,8 +1092,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+ #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a)
+ #define IS_I915GM(dev) ((dev)->pci_device == 0x2592)
+ #define IS_I945G(dev) ((dev)->pci_device == 0x2772)
+-#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2)
+-
++#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2 ||\
++ (dev)->pci_device == 0x27AE)
+ #define IS_I965G(dev) ((dev)->pci_device == 0x2972 || \
+ (dev)->pci_device == 0x2982 || \
+ (dev)->pci_device == 0x2992 || \
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 465ad35..1399971 100644
--- a/drivers/char/hpet.c
@@ -18046,6 +18093,30 @@
}
/*
+diff --git a/drivers/media/Makefile b/drivers/media/Makefile
+index 8cf9135..7b8bb69 100644
+--- a/drivers/media/Makefile
++++ b/drivers/media/Makefile
+@@ -6,3 +6,6 @@ obj-y := common/
+ obj-y += video/
+ obj-$(CONFIG_VIDEO_DEV) += radio/
+ obj-$(CONFIG_DVB_CORE) += dvb/
++ifeq ($(CONFIG_DVB_CORE),)
++ obj-$(CONFIG_VIDEO_TUNER) += dvb/frontends/
++endif
+diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c
+index 8194334..1a4d831 100644
+--- a/drivers/media/dvb/frontends/s5h1409.c
++++ b/drivers/media/dvb/frontends/s5h1409.c
+@@ -445,7 +445,7 @@ static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable)
+ s5h1409_readreg(state, 0xe3) | 0x1100);
+ else
+ return s5h1409_writereg(state, 0xe3,
+- s5h1409_readreg(state, 0xe3) & 0xeeff);
++ s5h1409_readreg(state, 0xe3) & 0xfeff);
+ }
+
+ static int s5h1409_sleep(struct dvb_frontend* fe, int enable)
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 34e317c..57b9e3a 100644
--- a/drivers/media/radio/radio-cadet.c
@@ -18070,6 +18141,36 @@
static int cadet_probe(void)
{
static int iovals[8]={0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e};
+diff --git a/drivers/media/video/bt8xx/bt832.c b/drivers/media/video/bt8xx/bt832.c
+index a518761..f92f06d 100644
+--- a/drivers/media/video/bt8xx/bt832.c
++++ b/drivers/media/video/bt8xx/bt832.c
+@@ -97,6 +97,11 @@ int bt832_init(struct i2c_client *i2c_client_s)
+ int rc;
+
+ buf=kmalloc(65,GFP_KERNEL);
++ if (!buf) {
++ v4l_err(&t->client,
++ "Unable to allocate memory. Detaching.\n");
++ return 0;
++ }
+ bt832_hexdump(i2c_client_s,buf);
+
+ if(buf[0x40] != 0x31) {
+@@ -211,7 +216,12 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
+ switch (cmd) {
+ case BT832_HEXDUMP: {
+ unsigned char *buf;
+- buf=kmalloc(65,GFP_KERNEL);
++ buf = kmalloc(65, GFP_KERNEL);
++ if (!buf) {
++ v4l_err(&t->client,
++ "Unable to allocate memory\n");
++ break;
++ }
+ bt832_hexdump(&t->client,buf);
+ kfree(buf);
+ }
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index a080c14..fcf8f2d 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
@@ -18365,6 +18466,61 @@
/* Apply a sensible clock frequency for the PCIe bridge */
dev->clk_freq = 28000000;
} else
+diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+index 4df6d6d..98557ce 100644
+--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
++++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+@@ -155,6 +155,37 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = {
+
+
+ /*------------------------------------------------------------------------*/
++/* Hauppauge PVR-USB2 Model 73xxx */
++
++static const char *pvr2_client_73xxx[] = {
++ "cx25840",
++ "tuner",
++};
++
++static const char *pvr2_fw1_names_73xxx[] = {
++ "v4l-pvrusb2-73xxx-01.fw",
++};
++
++static const struct pvr2_device_desc pvr2_device_73xxx = {
++ .description = "WinTV PVR USB2 Model Category 73xxxx",
++ .shortname = "73xxx",
++ .client_modules.lst = pvr2_client_73xxx,
++ .client_modules.cnt = ARRAY_SIZE(pvr2_client_73xxx),
++ .fx2_firmware.lst = pvr2_fw1_names_73xxx,
++ .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_73xxx),
++ .flag_has_cx25840 = !0,
++ .flag_has_hauppauge_rom = !0,
++ .flag_has_analogtuner = !0,
++ .flag_has_composite = !0,
++ .flag_has_svideo = !0,
++ .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
++ .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
++ .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
++};
++
++
++
++/*------------------------------------------------------------------------*/
+ /* Hauppauge PVR-USB2 Model 75xxx */
+
+ static const char *pvr2_client_75xxx[] = {
+@@ -198,8 +229,12 @@ struct usb_device_id pvr2_device_table[] = {
+ { USB_DEVICE(0x11ba, 0x1001),
+ .driver_info = (kernel_ulong_t)&pvr2_device_onair_usb2},
+ #endif
++ { USB_DEVICE(0x2040, 0x7300),
++ .driver_info = (kernel_ulong_t)&pvr2_device_73xxx},
+ { USB_DEVICE(0x2040, 0x7500),
+ .driver_info = (kernel_ulong_t)&pvr2_device_75xxx},
++ { USB_DEVICE(0x2040, 0x7501),
++ .driver_info = (kernel_ulong_t)&pvr2_device_75xxx},
+ { }
+ };
+
diff --git a/drivers/media/video/v4l2-int-device.c b/drivers/media/video/v4l2-int-device.c
index a545dca..0e45499 100644
--- a/drivers/media/video/v4l2-int-device.c
@@ -20217,6 +20373,46 @@
{ PCI_VDEVICE(MARVELL, 0x6440), chip_6440 },
{ PCI_VDEVICE(MARVELL, 0x6480), chip_6480 },
+diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
+index e5c6f6a..c78b836 100644
+--- a/drivers/scsi/scsi.c
++++ b/drivers/scsi/scsi.c
+@@ -181,6 +181,18 @@ struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)
+ cmd = kmem_cache_alloc(shost->cmd_pool->cmd_slab,
+ gfp_mask | shost->cmd_pool->gfp_mask);
+
++ if (likely(cmd)) {
++ buf = kmem_cache_alloc(shost->cmd_pool->sense_slab,
++ gfp_mask | shost->cmd_pool->gfp_mask);
++ if (likely(buf)) {
++ memset(cmd, 0, sizeof(*cmd));
++ cmd->sense_buffer = buf;
++ } else {
++ kmem_cache_free(shost->cmd_pool->cmd_slab, cmd);
++ cmd = NULL;
++ }
++ }
++
+ if (unlikely(!cmd)) {
+ unsigned long flags;
+
+@@ -197,16 +209,6 @@ struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)
+ memset(cmd, 0, sizeof(*cmd));
+ cmd->sense_buffer = buf;
+ }
+- } else {
+- buf = kmem_cache_alloc(shost->cmd_pool->sense_slab,
+- gfp_mask | shost->cmd_pool->gfp_mask);
+- if (likely(buf)) {
+- memset(cmd, 0, sizeof(*cmd));
+- cmd->sense_buffer = buf;
+- } else {
+- kmem_cache_free(shost->cmd_pool->cmd_slab, cmd);
+- cmd = NULL;
+- }
+ }
+
+ return cmd;
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index b9b09a7..ed83cdb 100644
--- a/drivers/scsi/scsi_sysfs.c
@@ -20473,6 +20669,19 @@
.num_ports = 2,
.open = visor_open,
.close = visor_close,
+diff --git a/drivers/watchdog/it8712f_wdt.c b/drivers/watchdog/it8712f_wdt.c
+index ca90c51..445b7e8 100644
+--- a/drivers/watchdog/it8712f_wdt.c
++++ b/drivers/watchdog/it8712f_wdt.c
+@@ -200,6 +200,8 @@ it8712f_wdt_disable(void)
+
+ superio_outb(0, WDT_CONFIG);
+ superio_outb(0, WDT_CONTROL);
++ if (revision >= 0x08)
++ superio_outb(0, WDT_TIMEOUT + 1);
+ superio_outb(0, WDT_TIMEOUT);
+
+ superio_exit();
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index ea94dba..d85dc6d 100644
--- a/drivers/xen/grant-table.c
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Mon Apr 7 09:04:30 2008
@@ -1,4 +1,4 @@
-+ bugfix/all/patch-2.6.25-rc8-git3
++ bugfix/all/patch-2.6.25-rc8-git5
+ debian/version.patch
+ debian/kernelvariables.patch
+ debian/doc-build-parallel.patch
More information about the Kernel-svn-changes
mailing list