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

Commit 2fc565e4 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.10-3' of... 

Merge tag 'asoc-v3.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: More updates for v3.10

A few more fixes, nothing too major though the DMA changes fix modular
builds.
parents 7fc7d047 5cc50fc8

Documentation/kernel-parameters.txt

+26 −3
Original line number Original line Diff line number Diff line
@@ -596,9 +596,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			is selected automatically. Check

			is selected automatically. Check

			Documentation/kdump/kdump.txt for further details.

			Documentation/kdump/kdump.txt for further details.





	crashkernel_low=size[KMG]

			[KNL, x86] parts under 4G.



	crashkernel=range1:size1[,range2:size2,...][@offset]

	crashkernel=range1:size1[,range2:size2,...][@offset]

			[KNL] Same as above, but depends on the memory

			[KNL] Same as above, but depends on the memory

			in the running system. The syntax of range is

			in the running system. The syntax of range is
@@ -606,6 +603,26 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			a memory unit (amount[KMG]). See also

			a memory unit (amount[KMG]). See also

			Documentation/kdump/kdump.txt for an example.

			Documentation/kdump/kdump.txt for an example.





	crashkernel=size[KMG],high

			[KNL, x86_64] range could be above 4G. Allow kernel

			to allocate physical memory region from top, so could

			be above 4G if system have more than 4G ram installed.

			Otherwise memory region will be allocated below 4G, if

			available.

			It will be ignored if crashkernel=X is specified.

	crashkernel=size[KMG],low

			[KNL, x86_64] range under 4G. When crashkernel=X,high

			is passed, kernel could allocate physical memory region

			above 4G, that cause second kernel crash on system

			that require some amount of low memory, e.g. swiotlb

			requires at least 64M+32K low memory.  Kernel would

			try to allocate 72M below 4G automatically.

			This one let user to specify own low range under 4G

			for second kernel instead.

			0: to disable low allocation.

			It will be ignored when crashkernel=X,high is not used

			or memory reserved is below 4G.



	cs89x0_dma=	[HW,NET]

	cs89x0_dma=	[HW,NET]

			Format: <dma>

			Format: <dma>
@@ -788,6 +805,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	edd=		[EDD]

	edd=		[EDD]

			Format: {"off" | "on" | "skip[mbr]"}

			Format: {"off" | "on" | "skip[mbr]"}





	efi_no_storage_paranoia [EFI; X86]

			Using this parameter you can use more than 50% of

			your efi variable storage. Use this parameter only if

			you are really sure that your UEFI does sane gc and

			fulfills the spec otherwise your board may brick.



	eisa_irq_edge=	[PARISC,HW]

	eisa_irq_edge=	[PARISC,HW]

			See header of drivers/parisc/eisa.c.

			See header of drivers/parisc/eisa.c.

Makefile

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

VERSION = 3

PATCHLEVEL = 9

PATCHLEVEL = 9

SUBLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Unicycling Gorilla

NAME = Unicycling Gorilla





# *DOCUMENTATION*

# *DOCUMENTATION*
@@ -513,7 +513,8 @@ ifeq ($(KBUILD_EXTMOD),) 
# Carefully list dependencies so we do not try to build scripts twice

# Carefully list dependencies so we do not try to build scripts twice

# in parallel

# in parallel

PHONY += scripts

PHONY += scripts

scripts: scripts_basic include/config/auto.conf include/config/tristate.conf

scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \

	 asm-generic

	$(Q)$(MAKE) $(build)=$(@)

	$(Q)$(MAKE) $(build)=$(@)





# Objects we will link into vmlinux / subdirs we need to visit

# Objects we will link into vmlinux / subdirs we need to visit

arch/arm/include/asm/glue-cache.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -19,14 +19,6 @@ 
#undef _CACHE

#undef _CACHE

#undef MULTI_CACHE

#undef MULTI_CACHE





#if defined(CONFIG_CPU_CACHE_V3)

# ifdef _CACHE

#  define MULTI_CACHE 1

# else

#  define _CACHE v3

# endif

#endif



#if defined(CONFIG_CPU_CACHE_V4)

#if defined(CONFIG_CPU_CACHE_V4)

# ifdef _CACHE

# ifdef _CACHE

#  define MULTI_CACHE 1

#  define MULTI_CACHE 1

arch/arm/include/asm/hardware/iop3xx.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ extern int iop3xx_get_init_atu(void); 
 * IOP3XX processor registers

 * IOP3XX processor registers

 */

 */

#define IOP3XX_PERIPHERAL_PHYS_BASE	0xffffe000

#define IOP3XX_PERIPHERAL_PHYS_BASE	0xffffe000

#define IOP3XX_PERIPHERAL_VIRT_BASE	0xfeffe000

#define IOP3XX_PERIPHERAL_VIRT_BASE	0xfedfe000

#define IOP3XX_PERIPHERAL_SIZE		0x00002000

#define IOP3XX_PERIPHERAL_SIZE		0x00002000

#define IOP3XX_PERIPHERAL_UPPER_PA (IOP3XX_PERIPHERAL_PHYS_BASE +\

#define IOP3XX_PERIPHERAL_UPPER_PA (IOP3XX_PERIPHERAL_PHYS_BASE +\

					IOP3XX_PERIPHERAL_SIZE - 1)

					IOP3XX_PERIPHERAL_SIZE - 1)

arch/arm/include/asm/pgtable-3level.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -111,7 +111,7 @@ 
#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* MemAttr[3:0] */

#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* MemAttr[3:0] */

#define L_PTE_S2_MT_WRITEBACK	 (_AT(pteval_t, 0xf) << 2) /* MemAttr[3:0] */

#define L_PTE_S2_MT_WRITEBACK	 (_AT(pteval_t, 0xf) << 2) /* MemAttr[3:0] */

#define L_PTE_S2_RDONLY		 (_AT(pteval_t, 1) << 6)   /* HAP[1]   */

#define L_PTE_S2_RDONLY		 (_AT(pteval_t, 1) << 6)   /* HAP[1]   */

#define L_PTE_S2_RDWR		 (_AT(pteval_t, 2) << 6)   /* HAP[2:1] */

#define L_PTE_S2_RDWR		 (_AT(pteval_t, 3) << 6)   /* HAP[2:1] */





/*

/*

 * Hyp-mode PL2 PTE definitions for LPAE.

 * Hyp-mode PL2 PTE definitions for LPAE.