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

Commit 236a686b authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream

parents 36a2c6b2 efe78cda

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -214,6 +214,12 @@ W: http://acpi.sourceforge.net/ 
T:	git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git

S:	Maintained



ACPI PCI HOTPLUG DRIVER

P:	Kristen Carlson Accardi

M:	kristen.c.accardi@intel.com

L:	pcihpd-discuss@lists.sourceforge.net

S:	Maintained



AD1816 SOUND DRIVER

P:	Thorsten Knabe

M:	Thorsten Knabe <linux@thorsten-knabe.de>

arch/ia64/hp/sim/simscsi.c

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static void 
simscsi_sg_readwrite (struct scsi_cmnd *sc, int mode, unsigned long offset)

{

	int list_len = sc->use_sg;

	struct scatterlist *sl = (struct scatterlist *)sc->buffer;

	struct scatterlist *sl = (struct scatterlist *)sc->request_buffer;

	struct disk_stat stat;

	struct disk_req req;
@@ -244,7 +244,7 @@ static void simscsi_fillresult(struct scsi_cmnd *sc, char *buf, unsigned len) 


	if (scatterlen == 0)

		memcpy(sc->request_buffer, buf, len);

	else for (slp = (struct scatterlist *)sc->buffer; scatterlen-- > 0 && len > 0; slp++) {

	else for (slp = (struct scatterlist *)sc->request_buffer; scatterlen-- > 0 && len > 0; slp++) {

		unsigned thislen = min(len, slp->length);



		memcpy(page_address(slp->page) + slp->offset, buf, thislen);

arch/ia64/kernel/efi.c

+3 −3
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ kern_memory_descriptor (unsigned long phys_addr) 
		if (phys_addr - md->start < (md->num_pages << EFI_PAGE_SHIFT))

			 return md;

	}

	return 0;

	return NULL;

}



static efi_memory_desc_t *
@@ -652,7 +652,7 @@ efi_memory_descriptor (unsigned long phys_addr) 
		if (phys_addr - md->phys_addr < (md->num_pages << EFI_PAGE_SHIFT))

			 return md;

	}

	return 0;

	return NULL;

}



u32
@@ -923,7 +923,7 @@ find_memmap_space (void) 
void

efi_memmap_init(unsigned long *s, unsigned long *e)

{

	struct kern_memdesc *k, *prev = 0;

	struct kern_memdesc *k, *prev = NULL;

	u64	contig_low=0, contig_high=0;

	u64	as, ae, lim;

	void *efi_map_start, *efi_map_end, *p, *q;

arch/ia64/kernel/head.S

+0 −2
Original line number Diff line number Diff line
@@ -853,7 +853,6 @@ END(__ia64_init_fpu) 
 */

GLOBAL_ENTRY(ia64_switch_mode_phys)

 {

	alloc r2=ar.pfs,0,0,0,0

	rsm psr.i | psr.ic		// disable interrupts and interrupt collection

	mov r15=ip

 }
@@ -902,7 +901,6 @@ END(ia64_switch_mode_phys) 
 */

GLOBAL_ENTRY(ia64_switch_mode_virt)

 {

	alloc r2=ar.pfs,0,0,0,0

	rsm psr.i | psr.ic		// disable interrupts and interrupt collection

	mov r15=ip

 }

arch/ia64/kernel/ia64_ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ EXPORT_SYMBOL(__udivdi3); 
EXPORT_SYMBOL(__moddi3);

EXPORT_SYMBOL(__umoddi3);



#if defined(CONFIG_MD_RAID5) || defined(CONFIG_MD_RAID5_MODULE)

#if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE)

extern void xor_ia64_2(void);

extern void xor_ia64_3(void);

extern void xor_ia64_4(void);