Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird (423ab71a) · Commits · e / devices / samsung / android_kernel_samsung_exynos7580-common

arch/arm/Kconfig

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -69,6 +69,9 @@ config GENERIC_ISA_DMA
	config FIQ		config FIQ
	bool		bool

			config ARCH_MTD_XIP
			bool

	source "init/Kconfig"		source "init/Kconfig"

	menu "System Type"		menu "System Type"
	@@ -136,6 +139,7 @@ config ARCH_L7200

	config ARCH_PXA		config ARCH_PXA
	bool "PXA2xx-based"		bool "PXA2xx-based"
			select ARCH_MTD_XIP

	config ARCH_RPC		config ARCH_RPC
	bool "RiscPC"		bool "RiscPC"
	@@ -152,6 +156,7 @@ config ARCH_SA1100
	bool "SA1100-based"		bool "SA1100-based"
	select ISA		select ISA
	select ARCH_DISCONTIGMEM_ENABLE		select ARCH_DISCONTIGMEM_ENABLE
			select ARCH_MTD_XIP

	config ARCH_S3C2410		config ARCH_S3C2410
	bool "Samsung S3C2410"		bool "Samsung S3C2410"

arch/powerpc/kernel/signal_32.c

+7 −11

Original line number	Original line	Diff line number	Diff line
	@@ -142,11 +142,7 @@ static inline int get_old_sigaction(struct k_sigaction *new_ka,
	return 0;		return 0;
	}		}

	static inline compat_uptr_t to_user_ptr(void *kp)		#define to_user_ptr(p) ptr_to_compat(p)
	{
	return (compat_uptr_t)(u64)kp;
	}

	#define from_user_ptr(p) compat_ptr(p)		#define from_user_ptr(p) compat_ptr(p)

	static inline int save_general_regs(struct pt_regs *regs,		static inline int save_general_regs(struct pt_regs *regs,
	@@ -213,8 +209,8 @@ static inline int get_old_sigaction(struct k_sigaction *new_ka,
	return 0;		return 0;
	}		}

	#define to_user_ptr(p) (p)		#define to_user_ptr(p) ((unsigned long)(p))
	#define from_user_ptr(p) (p)		#define from_user_ptr(p) ((void __user *)(p))

	static inline int save_general_regs(struct pt_regs *regs,		static inline int save_general_regs(struct pt_regs *regs,
	struct mcontext __user *frame)		struct mcontext __user *frame)
	@@ -526,7 +522,7 @@ long compat_sys_rt_sigaction(int sig, const struct sigaction32 __user *act,

	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);		ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
	if (!ret && oact) {		if (!ret && oact) {
	ret = put_user((long)old_ka.sa.sa_handler, &oact->sa_handler);		ret = put_user(to_user_ptr(old_ka.sa.sa_handler), &oact->sa_handler);
	ret \|= put_sigset_t(&oact->sa_mask, &old_ka.sa.sa_mask);		ret \|= put_sigset_t(&oact->sa_mask, &old_ka.sa.sa_mask);
	ret \|= __put_user(old_ka.sa.sa_flags, &oact->sa_flags);		ret \|= __put_user(old_ka.sa.sa_flags, &oact->sa_flags);
	}		}
	@@ -675,8 +671,8 @@ long compat_sys_rt_sigqueueinfo(u32 pid, u32 sig, compat_siginfo_t __user *uinfo
	int compat_sys_sigaltstack(u32 __new, u32 __old, int r5,		int compat_sys_sigaltstack(u32 __new, u32 __old, int r5,
	int r6, int r7, int r8, struct pt_regs *regs)		int r6, int r7, int r8, struct pt_regs *regs)
	{		{
	stack_32_t __user * newstack = (stack_32_t __user *)(long) __new;		stack_32_t __user * newstack = compat_ptr(__new);
	stack_32_t __user * oldstack = (stack_32_t __user *)(long) __old;		stack_32_t __user * oldstack = compat_ptr(__old);
	stack_t uss, uoss;		stack_t uss, uoss;
	int ret;		int ret;
	mm_segment_t old_fs;		mm_segment_t old_fs;
	@@ -708,7 +704,7 @@ int compat_sys_sigaltstack(u32 __new, u32 __old, int r5,
	set_fs(old_fs);		set_fs(old_fs);
	/* Copy the stack information to the user output buffer */		/* Copy the stack information to the user output buffer */
	if (!ret && oldstack &&		if (!ret && oldstack &&
	(put_user((long)uoss.ss_sp, &oldstack->ss_sp) \|\|		(put_user(ptr_to_compat(uoss.ss_sp), &oldstack->ss_sp) \|\|
	__put_user(uoss.ss_flags, &oldstack->ss_flags) \|\|		__put_user(uoss.ss_flags, &oldstack->ss_flags) \|\|
	__put_user(uoss.ss_size, &oldstack->ss_size)))		__put_user(uoss.ss_size, &oldstack->ss_size)))
	return -EFAULT;		return -EFAULT;

arch/powerpc/kernel/signal_64.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -60,8 +60,8 @@ struct rt_sigframe {
	struct ucontext uc;		struct ucontext uc;
	unsigned long _unused[2];		unsigned long _unused[2];
	unsigned int tramp[TRAMP_SIZE];		unsigned int tramp[TRAMP_SIZE];
	struct siginfo *pinfo;		struct siginfo __user *pinfo;
	void *puc;		void __user *puc;
	struct siginfo info;		struct siginfo info;
	/* 64 bit ABI allows for 288 bytes below sp before decrementing it. */		/* 64 bit ABI allows for 288 bytes below sp before decrementing it. */
	char abigap[288];		char abigap[288];

arch/powerpc/platforms/powermac/pci.c

+43 −46

Original line number	Original line	Diff line number	Diff line
	@@ -136,14 +136,14 @@ static void __init fixup_bus_range(struct device_node *bridge)
	\|(((unsigned int)(off)) & 0xFCUL) \		\|(((unsigned int)(off)) & 0xFCUL) \
	\|1UL)		\|1UL)

	static unsigned long macrisc_cfg_access(struct pci_controller* hose,		static volatile void __iomem macrisc_cfg_access(struct pci_controller hose,
	u8 bus, u8 dev_fn, u8 offset)		u8 bus, u8 dev_fn, u8 offset)
	{		{
	unsigned int caddr;		unsigned int caddr;

	if (bus == hose->first_busno) {		if (bus == hose->first_busno) {
	if (dev_fn < (11 << 3))		if (dev_fn < (11 << 3))
	return 0;		return NULL;
	caddr = MACRISC_CFA0(dev_fn, offset);		caddr = MACRISC_CFA0(dev_fn, offset);
	} else		} else
	caddr = MACRISC_CFA1(bus, dev_fn, offset);		caddr = MACRISC_CFA1(bus, dev_fn, offset);
	@@ -154,14 +154,14 @@ static unsigned long macrisc_cfg_access(struct pci_controller* hose,
	} while (in_le32(hose->cfg_addr) != caddr);		} while (in_le32(hose->cfg_addr) != caddr);

	offset &= has_uninorth ? 0x07 : 0x03;		offset &= has_uninorth ? 0x07 : 0x03;
	return ((unsigned long)hose->cfg_data) + offset;		return hose->cfg_data + offset;
	}		}

	static int macrisc_read_config(struct pci_bus *bus, unsigned int devfn,		static int macrisc_read_config(struct pci_bus *bus, unsigned int devfn,
	int offset, int len, u32 *val)		int offset, int len, u32 *val)
	{		{
	struct pci_controller *hose;		struct pci_controller *hose;
	unsigned long addr;		volatile void __iomem *addr;

	hose = pci_bus_to_host(bus);		hose = pci_bus_to_host(bus);
	if (hose == NULL)		if (hose == NULL)
	@@ -177,13 +177,13 @@ static int macrisc_read_config(struct pci_bus *bus, unsigned int devfn,
	*/		*/
	switch (len) {		switch (len) {
	case 1:		case 1:
	val = in_8((u8 )addr);		*val = in_8(addr);
	break;		break;
	case 2:		case 2:
	val = in_le16((u16 )addr);		*val = in_le16(addr);
	break;		break;
	default:		default:
	val = in_le32((u32 )addr);		*val = in_le32(addr);
	break;		break;
	}		}
	return PCIBIOS_SUCCESSFUL;		return PCIBIOS_SUCCESSFUL;
	@@ -193,7 +193,7 @@ static int macrisc_write_config(struct pci_bus *bus, unsigned int devfn,
	int offset, int len, u32 val)		int offset, int len, u32 val)
	{		{
	struct pci_controller *hose;		struct pci_controller *hose;
	unsigned long addr;		volatile void __iomem *addr;

	hose = pci_bus_to_host(bus);		hose = pci_bus_to_host(bus);
	if (hose == NULL)		if (hose == NULL)
	@@ -209,16 +209,16 @@ static int macrisc_write_config(struct pci_bus *bus, unsigned int devfn,
	*/		*/
	switch (len) {		switch (len) {
	case 1:		case 1:
	out_8((u8 *)addr, val);		out_8(addr, val);
	(void) in_8((u8 *)addr);		(void) in_8(addr);
	break;		break;
	case 2:		case 2:
	out_le16((u16 *)addr, val);		out_le16(addr, val);
	(void) in_le16((u16 *)addr);		(void) in_le16(addr);
	break;		break;
	default:		default:
	out_le32((u32 *)addr, val);		out_le32(addr, val);
	(void) in_le32((u32 *)addr);		(void) in_le32(addr);
	break;		break;
	}		}
	return PCIBIOS_SUCCESSFUL;		return PCIBIOS_SUCCESSFUL;
	@@ -348,25 +348,23 @@ static int u3_ht_skip_device(struct pci_controller *hose,
	+ (((unsigned int)bus) << 16) \		+ (((unsigned int)bus) << 16) \
	+ 0x01000000UL)		+ 0x01000000UL)

	static unsigned long u3_ht_cfg_access(struct pci_controller* hose,		static volatile void __iomem u3_ht_cfg_access(struct pci_controller hose,
	u8 bus, u8 devfn, u8 offset)		u8 bus, u8 devfn, u8 offset)
	{		{
	if (bus == hose->first_busno) {		if (bus == hose->first_busno) {
	/* For now, we don't self probe U3 HT bridge */		/* For now, we don't self probe U3 HT bridge */
	if (PCI_SLOT(devfn) == 0)		if (PCI_SLOT(devfn) == 0)
	return 0;		return NULL;
	return ((unsigned long)hose->cfg_data) +		return hose->cfg_data + U3_HT_CFA0(devfn, offset);
	U3_HT_CFA0(devfn, offset);
	} else		} else
	return ((unsigned long)hose->cfg_data) +		return hose->cfg_data + U3_HT_CFA1(bus, devfn, offset);
	U3_HT_CFA1(bus, devfn, offset);
	}		}

	static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn,		static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn,
	int offset, int len, u32 *val)		int offset, int len, u32 *val)
	{		{
	struct pci_controller *hose;		struct pci_controller *hose;
	unsigned long addr;		volatile void __iomem *addr;

	hose = pci_bus_to_host(bus);		hose = pci_bus_to_host(bus);
	if (hose == NULL)		if (hose == NULL)
	@@ -400,13 +398,13 @@ static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn,
	*/		*/
	switch (len) {		switch (len) {
	case 1:		case 1:
	val = in_8((u8 )addr);		*val = in_8(addr);
	break;		break;
	case 2:		case 2:
	val = in_le16((u16 )addr);		*val = in_le16(addr);
	break;		break;
	default:		default:
	val = in_le32((u32 )addr);		*val = in_le32(addr);
	break;		break;
	}		}
	return PCIBIOS_SUCCESSFUL;		return PCIBIOS_SUCCESSFUL;
	@@ -416,7 +414,7 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,
	int offset, int len, u32 val)		int offset, int len, u32 val)
	{		{
	struct pci_controller *hose;		struct pci_controller *hose;
	unsigned long addr;		volatile void __iomem *addr;

	hose = pci_bus_to_host(bus);		hose = pci_bus_to_host(bus);
	if (hose == NULL)		if (hose == NULL)
	@@ -442,16 +440,16 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,
	*/		*/
	switch (len) {		switch (len) {
	case 1:		case 1:
	out_8((u8 *)addr, val);		out_8(addr, val);
	(void) in_8((u8 *)addr);		(void) in_8(addr);
	break;		break;
	case 2:		case 2:
	out_le16((u16 *)addr, val);		out_le16(addr, val);
	(void) in_le16((u16 *)addr);		(void) in_le16(addr);
	break;		break;
	default:		default:
	out_le32((u32 *)addr, val);		out_le32((u32 __iomem *)addr, val);
	(void) in_le32((u32 *)addr);		(void) in_le32(addr);
	break;		break;
	}		}
	return PCIBIOS_SUCCESSFUL;		return PCIBIOS_SUCCESSFUL;
	@@ -476,7 +474,7 @@ static struct pci_ops u3_ht_pci_ops =
	\|(((unsigned int)(off)) & 0xfcU) \		\|(((unsigned int)(off)) & 0xfcU) \
	\|1UL)		\|1UL)

	static unsigned long u4_pcie_cfg_access(struct pci_controller* hose,		static volatile void __iomem u4_pcie_cfg_access(struct pci_controller hose,
	u8 bus, u8 dev_fn, int offset)		u8 bus, u8 dev_fn, int offset)
	{		{
	unsigned int caddr;		unsigned int caddr;
	@@ -492,14 +490,14 @@ static unsigned long u4_pcie_cfg_access(struct pci_controller* hose,
	} while (in_le32(hose->cfg_addr) != caddr);		} while (in_le32(hose->cfg_addr) != caddr);

	offset &= 0x03;		offset &= 0x03;
	return ((unsigned long)hose->cfg_data) + offset;		return hose->cfg_data + offset;
	}		}

	static int u4_pcie_read_config(struct pci_bus *bus, unsigned int devfn,		static int u4_pcie_read_config(struct pci_bus *bus, unsigned int devfn,
	int offset, int len, u32 *val)		int offset, int len, u32 *val)
	{		{
	struct pci_controller *hose;		struct pci_controller *hose;
	unsigned long addr;		volatile void __iomem *addr;

	hose = pci_bus_to_host(bus);		hose = pci_bus_to_host(bus);
	if (hose == NULL)		if (hose == NULL)
	@@ -515,13 +513,13 @@ static int u4_pcie_read_config(struct pci_bus *bus, unsigned int devfn,
	*/		*/
	switch (len) {		switch (len) {
	case 1:		case 1:
	val = in_8((u8 )addr);		*val = in_8(addr);
	break;		break;
	case 2:		case 2:
	val = in_le16((u16 )addr);		*val = in_le16(addr);
	break;		break;
	default:		default:
	val = in_le32((u32 )addr);		*val = in_le32(addr);
	break;		break;
	}		}
	return PCIBIOS_SUCCESSFUL;		return PCIBIOS_SUCCESSFUL;
	@@ -531,7 +529,7 @@ static int u4_pcie_write_config(struct pci_bus *bus, unsigned int devfn,
	int offset, int len, u32 val)		int offset, int len, u32 val)
	{		{
	struct pci_controller *hose;		struct pci_controller *hose;
	unsigned long addr;		volatile void __iomem *addr;

	hose = pci_bus_to_host(bus);		hose = pci_bus_to_host(bus);
	if (hose == NULL)		if (hose == NULL)
	@@ -547,16 +545,16 @@ static int u4_pcie_write_config(struct pci_bus *bus, unsigned int devfn,
	*/		*/
	switch (len) {		switch (len) {
	case 1:		case 1:
	out_8((u8 *)addr, val);		out_8(addr, val);
	(void) in_8((u8 *)addr);		(void) in_8(addr);
	break;		break;
	case 2:		case 2:
	out_le16((u16 *)addr, val);		out_le16(addr, val);
	(void) in_le16((u16 *)addr);		(void) in_le16(addr);
	break;		break;
	default:		default:
	out_le32((u32 *)addr, val);		out_le32(addr, val);
	(void) in_le32((u32 *)addr);		(void) in_le32(addr);
	break;		break;
	}		}
	return PCIBIOS_SUCCESSFUL;		return PCIBIOS_SUCCESSFUL;
	@@ -773,8 +771,7 @@ static void __init setup_u3_ht(struct pci_controller* hose)
	* the reg address cell, we shall fix that by killing struct		* the reg address cell, we shall fix that by killing struct
	* reg_property and using some accessor functions instead		* reg_property and using some accessor functions instead
	*/		*/
	hose->cfg_data = (volatile unsigned char *)ioremap(0xf2000000,		hose->cfg_data = ioremap(0xf2000000, 0x02000000);
	0x02000000);

	/*		/*
	* /ht node doesn't expose a "ranges" property, so we "remove"		* /ht node doesn't expose a "ranges" property, so we "remove"

arch/powerpc/sysdev/dart_iommu.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -59,7 +59,7 @@ static unsigned long dart_tablesize;
	static u32 *dart_vbase;		static u32 *dart_vbase;

	/* Mapped base address for the dart */		/* Mapped base address for the dart */
	static unsigned int *__iomem dart;		static unsigned int __iomem *dart;

	/* Dummy val that entries are set to when unused */		/* Dummy val that entries are set to when unused */
	static unsigned int dart_emptyval;		static unsigned int dart_emptyval;