Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36dfc3f6 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream'

parents e8b09428 c6329f4d

Documentation/kernel-parameters.txt

+8 −0
Original line number Diff line number Diff line
@@ -633,6 +633,14 @@ running once the system is up. 
	inport.irq=	[HW] Inport (ATI XL and Microsoft) busmouse driver

			Format: <irq>



	combined_mode=	[HW] control which driver uses IDE ports in combined

			mode: legacy IDE driver, libata, or both

			(in the libata case, libata.atapi_enabled=1 may be

			useful as well).  Note that using the ide or libata

			options may affect your device naming (e.g. by

			changing hdc to sdb).

			Format: combined (default), ide, or libata



	inttest=	[IA64]



	io7=		[HW] IO7 for Marvel based alpha systems

drivers/net/skge.c

+1 −1
Original line number Diff line number Diff line
@@ -2280,7 +2280,7 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev) 
 	}



	if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) {

		if (!netif_stopped(dev)) {

		if (!netif_queue_stopped(dev)) {

			netif_stop_queue(dev);



			printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",

drivers/pci/quirks.c

+30 −0
Original line number Diff line number Diff line
@@ -1098,6 +1098,23 @@ static void __init quirk_alder_ioapic(struct pci_dev *pdev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_EESSC,	quirk_alder_ioapic );

#endif



enum ide_combined_type { COMBINED = 0, IDE = 1, LIBATA = 2 };

/* Defaults to combined */

static enum ide_combined_type combined_mode;



static int __init combined_setup(char *str)

{

	if (!strncmp(str, "ide", 3))

		combined_mode = IDE;

	else if (!strncmp(str, "libata", 6))

		combined_mode = LIBATA;

	else /* "combined" or anything else defaults to old behavior */

		combined_mode = COMBINED;



	return 1;

}

__setup("combined_mode=", combined_setup);



#ifdef CONFIG_SCSI_SATA_INTEL_COMBINED

static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev)

{
@@ -1164,6 +1181,19 @@ static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev) 
	if (prog & comb)

		return;



	/* Don't reserve any so the IDE driver can get them (but only if

	 * combined_mode=ide).

	 */

	if (combined_mode == IDE)

		return;



	/* Grab them both for libata if combined_mode=libata. */

	if (combined_mode == LIBATA) {

		request_region(0x1f0, 8, "libata");	/* port 0 */

		request_region(0x170, 8, "libata");	/* port 1 */

		return;

	}



	/* SATA port is in legacy mode.  Reserve port so that

	 * IDE driver does not attempt to use it.  If request_region

	 * fails, it will be obvious at boot time, so we don't bother

include/asm-ia64/sal.h

+2 −1
Original line number Diff line number Diff line
@@ -320,7 +320,8 @@ typedef struct sal_log_timestamp { 
typedef struct sal_log_record_header {

	u64 id;				/* Unique monotonically increasing ID */

	sal_log_revision_t revision;	/* Major and Minor revision of header */

	u16 severity;			/* Error Severity */

	u8 severity;			/* Error Severity */

	u8 validation_bits;		/* 0: platform_guid, 1: !timestamp */

	u32 len;			/* Length of this error log in bytes */

	sal_log_timestamp_t timestamp;	/* Timestamp */

	efi_guid_t platform_guid;	/* Unique OEM Platform ID */

init/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ config HOTPLUG 
	  outside the kernel tree does. Such modules require Y here.



config KOBJECT_UEVENT

	bool "Kernel Userspace Events"

	bool "Kernel Userspace Events" if EMBEDDED

	depends on NET

	default y

	help
@@ -339,7 +339,7 @@ config EPOLL 
	  support for epoll family of system calls.



config CC_OPTIMIZE_FOR_SIZE

	bool "Optimize for size" if EMBEDDED

	bool "Optimize for size"

	default y if ARM || H8300

	help

	  Enabling this option will pass "-Os" instead of "-O2" to gcc