Commit 46e80e6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Ingo Molnar:
 "A handful of cleanups: dma-ops cleanups, missing boot time kcalloc()
  check, a Sparse fix and use struct_size() to simplify a vzalloc()
  call"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/pci: Clean up usage of X86_DEV_DMA_OPS
  x86/Kconfig: Remove the unused X86_DMA_REMAP KConfig symbol
  x86/kexec/crash: Use struct_size() in vzalloc()
  x86/mm/tlb: Define LOADED_MM_SWITCHING with pointer-sized number
  x86/platform/uv: Fix missing checks of kcalloc() return values
parents 82ac4043 15854edd

arch/x86/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ config X86_64 
	select MODULES_USE_ELF_RELA

	select NEED_DMA_MAP_STATE

	select SWIOTLB

	select X86_DEV_DMA_OPS

	select ARCH_HAS_SYSCALL_WRAPPER



#
@@ -700,8 +699,6 @@ config STA2X11 
	bool "STA2X11 Companion Chip Support"

	depends on X86_32_NON_STANDARD && PCI

	select ARCH_HAS_PHYS_TO_DMA

	select X86_DEV_DMA_OPS

	select X86_DMA_REMAP

	select SWIOTLB

	select MFD_STA2X11

	select GPIOLIB
@@ -2867,11 +2864,6 @@ config HAVE_ATOMIC_IOMAP 


config X86_DEV_DMA_OPS

	bool

	depends on X86_64 || STA2X11



config X86_DMA_REMAP

	bool

	depends on STA2X11



config HAVE_GENERIC_GUP

	def_bool y

arch/x86/include/asm/tlbflush.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct tlb_state { 
	 */

	struct mm_struct *loaded_mm;



#define LOADED_MM_SWITCHING ((struct mm_struct *)1)

#define LOADED_MM_SWITCHING ((struct mm_struct *)1UL)



	/* Last user mm for optimizing IBPB */

	union {

arch/x86/kernel/crash.c

+1 −2
Original line number Diff line number Diff line
@@ -204,8 +204,7 @@ static struct crash_mem *fill_up_crash_elf_data(void) 
	 * another range split. So add extra two slots here.

	 */

	nr_ranges += 2;

	cmem = vzalloc(sizeof(struct crash_mem) +

			sizeof(struct crash_mem_range) * nr_ranges);

	cmem = vzalloc(struct_size(cmem, ranges, nr_ranges));

	if (!cmem)

		return NULL;

arch/x86/platform/uv/tlb_uv.c

+6 −1
Original line number Diff line number Diff line
@@ -2133,14 +2133,19 @@ static int __init summarize_uvhub_sockets(int nuvhubs, 
 */

static int __init init_per_cpu(int nuvhubs, int base_part_pnode)

{

	unsigned char *uvhub_mask;

	struct uvhub_desc *uvhub_descs;

	unsigned char *uvhub_mask = NULL;



	if (is_uv3_hub() || is_uv2_hub() || is_uv1_hub())

		timeout_us = calculate_destination_timeout();



	uvhub_descs = kcalloc(nuvhubs, sizeof(struct uvhub_desc), GFP_KERNEL);

	if (!uvhub_descs)

		goto fail;



	uvhub_mask = kzalloc((nuvhubs+7)/8, GFP_KERNEL);

	if (!uvhub_mask)

		goto fail;



	if (get_cpu_topology(base_part_pnode, uvhub_descs, uvhub_mask))

		goto fail;

drivers/misc/mic/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ comment "Intel MIC Bus Driver" 


config INTEL_MIC_BUS

	tristate "Intel MIC Bus Driver"

	depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS

	depends on 64BIT && PCI && X86

	help

	  This option is selected by any driver which registers a

	  device or driver on the MIC Bus, such as CONFIG_INTEL_MIC_HOST,
@@ -21,7 +21,7 @@ comment "SCIF Bus Driver" 


config SCIF_BUS

	tristate "SCIF Bus Driver"

	depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS

	depends on 64BIT && PCI && X86

	help

	  This option is selected by any driver which registers a

	  device or driver on the SCIF Bus, such as CONFIG_INTEL_MIC_HOST

CRA Git | Maintained and supported by SUSTech CRA and CCSE