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

Commit e78a57de authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream'

parents 77501f3c 452503f9

.gitignore

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#

# NOTE! Don't add files that are generated in specific

# subdirectories here. Add them in the ".gitignore" file

# in that subdirectory instead.

#

# Normal rules

#

.*

*.o

*.a

*.s

*.ko

*.mod.c



#

# Top-level generic files

#

vmlinux*

System.map

Module.symvers



#

# Generated include files

#

include/asm

include/config

include/linux/autoconf.h

include/linux/compile.h

include/linux/version.h

Makefile

+2 −2
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 14

EXTRAVERSION =-rc4

EXTRAVERSION =-rc5

NAME=Affluent Albatross



# *DOCUMENTATION*
@@ -372,7 +372,7 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_ve 
# Files to ignore in find ... statements



RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg \) -prune -o

RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg

export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg



# ===========================================================================

# Rules shared between *config targets and build targets

arch/arm/mach-s3c2410/clock.c

+4 −1
Original line number Diff line number Diff line
@@ -98,7 +98,10 @@ struct clk *clk_get(struct device *dev, const char *id) 
	struct clk *clk = ERR_PTR(-ENOENT);

	int idno;



	idno = (dev == NULL) ? -1 : to_platform_device(dev)->id;

	if (dev == NULL || dev->bus != &platform_bus_type)

		idno = -1;

	else

		idno = to_platform_device(dev)->id;



	down(&clocks_sem);

arch/arm/mm/proc-v6.S

+8 −1
Original line number Diff line number Diff line
@@ -55,7 +55,14 @@ ENTRY(cpu_v6_proc_init) 
	mov	pc, lr



ENTRY(cpu_v6_proc_fin)

	mov	pc, lr

	stmfd	sp!, {lr}

	cpsid	if				@ disable interrupts

	bl	v6_flush_kern_cache_all

	mrc	p15, 0, r0, c1, c0, 0		@ ctrl register

	bic	r0, r0, #0x1000			@ ...i............

	bic	r0, r0, #0x0006			@ .............ca.

	mcr	p15, 0, r0, c1, c0, 0		@ disable caches

	ldmfd	sp!, {pc}



/*

 *	cpu_v6_reset(loc)

arch/ia64/lib/swiotlb.c

+2 −2
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ swiotlb_init_with_default_size (size_t default_size) 
	/*

	 * Get IO TLB memory from the low pages

	 */

	io_tlb_start = alloc_bootmem_low_pages(io_tlb_nslabs *

					       (1 << IO_TLB_SHIFT));

	io_tlb_start = alloc_bootmem_low_pages_limit(io_tlb_nslabs *

					     (1 << IO_TLB_SHIFT), 0x100000000);

	if (!io_tlb_start)

		panic("Cannot allocate SWIOTLB buffer");

	io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT);