remove <asm/scatterlist.h>
Subsystems (25)
PATCH 1/1 remove <asm/scatterlist.h>
We don't have any arch specific scatterlist now that parisc switched over to the generic one.
--- arch/alpha/include/asm/pci.h | 2 +- arch/arm/include/asm/dma.h | 2 +- arch/arm/mach-footbridge/dma.c | 2 +- arch/blackfin/include/asm/pci.h | 2 +- arch/cris/include/asm/dma-mapping.h | 2 +- arch/cris/include/asm/pci.h | 2 +- arch/frv/include/asm/dma-mapping.h | 2 +- arch/frv/include/asm/pci.h | 2 +- arch/ia64/include/asm/pci.h | 2 +- arch/microblaze/include/asm/pci.h | 2 +- arch/mips/include/asm/dma-mapping.h | 2 +- arch/mips/include/asm/pci.h | 2 +- arch/mn10300/include/asm/pci.h | 2 +- arch/parisc/include/asm/dma-mapping.h | 2 +- arch/parisc/include/asm/pci.h | 2 +- arch/powerpc/include/asm/pci.h | 2 +- arch/powerpc/include/asm/vio.h | 2 +- arch/sparc/kernel/iommu_common.h | 2 +- arch/x86/include/asm/pci.h | 2 +- arch/xtensa/include/asm/pci.h | 2 +- drivers/mmc/host/android-goldfish.c | 2 +- include/asm-generic/scatterlist.h | 34 ------------------------------ include/linux/blkdev.h | 3 +-- include/linux/dmapool.h | 2 +- include/linux/scatterlist.h | 39 ++++++++++++++++++++++++++++------- lib/swiotlb.c | 2 +- 26 files changed, 56 insertions(+), 66 deletions(-) delete mode 100644 include/asm-generic/scatterlist.h
arch/alpha/include/asm/pci.h +1 -1
@@ -5,7 +5,7 @@#include <linux/spinlock.h> #include <linux/dma-mapping.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <asm/machvec.h> #include <asm-generic/pci-bridge.h>
arch/arm/include/asm/dma.h +1 -1
@@ -19,7 +19,7 @@* It should not be re-used except for that purpose. */ #include <linux/spinlock.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <mach/isa-dma.h>
arch/arm/mach-footbridge/dma.c +1 -1
@@ -13,9 +13,9 @@#include <linux/init.h> #include <linux/io.h> #include <linux/spinlock.h> +#include <linux/scatterlist.h> #include <asm/dma.h> -#include <asm/scatterlist.h> #include <asm/mach/dma.h> #include <asm/hardware/dec21285.h>
arch/blackfin/include/asm/pci.h +1 -1
@@ -3,7 +3,7 @@#ifndef _ASM_BFIN_PCI_H#define _ASM_BFIN_PCI_H -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <asm-generic/pci-dma-compat.h> #include <asm-generic/pci.h>
arch/cris/include/asm/dma-mapping.h +1 -1
@@ -5,10 +5,10 @@#include <linux/mm.h> #include <linux/kernel.h> +#include <linux/scatterlist.h> #include <asm/cache.h> #include <asm/io.h> -#include <asm/scatterlist.h> #define dma_alloc_noncoherent (d, s, h, f) dma_alloc_coherent(d, s, h, f)#define dma_free_noncoherent (d, s, v, h) dma_free_coherent(d, s, v, h)
arch/cris/include/asm/pci.h +1 -1
@@ -29,7 +29,7 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);#include <linux/types.h> #include <linux/slab.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <linux/string.h> #include <asm/io.h>
arch/frv/include/asm/dma-mapping.h +1 -1
@@ -2,9 +2,9 @@#define _ASM_DMA_MAPPING_H#include <linux/device.h> +#include <linux/scatterlist.h> #include <asm/cache.h> #include <asm/cacheflush.h> -#include <asm/scatterlist.h> #include <asm/io.h> /*
arch/frv/include/asm/pci.h +1 -1
@@ -14,7 +14,7 @@#define _ASM_FRV_PCI_H#include <linux/mm.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <asm-generic/pci-dma-compat.h> #include <asm-generic/pci.h>
arch/ia64/include/asm/pci.h +1 -1
@@ -6,9 +6,9 @@#include <linux/spinlock.h> #include <linux/string.h> #include <linux/types.h> +#include <linux/scatterlist.h> #include <asm/io.h> -#include <asm/scatterlist.h> #include <asm/hw_irq.h> struct pci_vector_struct {
arch/microblaze/include/asm/pci.h +1 -1
@@ -16,8 +16,8 @@#include <linux/string.h> #include <linux/dma-mapping.h> #include <linux/pci.h> +#include <linux/scatterlist.h> -#include <asm/scatterlist.h> #include <asm/io.h> #include <asm/prom.h> #include <asm/pci-bridge.h>
arch/mips/include/asm/dma-mapping.h +1 -1
@@ -1,7 +1,7 @@#ifndef _ASM_DMA_MAPPING_H#define _ASM_DMA_MAPPING_H -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <asm/dma-coherence.h> #include <asm/cache.h> #include <asm-generic/dma-coherent.h>
arch/mips/include/asm/pci.h +1 -1
@@ -99,7 +99,7 @@ static inline void pci_resource_to_user(const struct pci_dev *dev, int bar,#include <linux/types.h> #include <linux/slab.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <linux/string.h> #include <asm/io.h> #include <asm-generic/pci-bridge.h>
arch/mn10300/include/asm/pci.h +1 -1
@@ -55,7 +55,7 @@ void pcibios_set_master(struct pci_dev *dev);#include <linux/types.h> #include <linux/slab.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <linux/string.h> #include <asm/io.h>
arch/parisc/include/asm/dma-mapping.h +1 -1
@@ -2,8 +2,8 @@#define _PARISC_DMA_MAPPING_H#include <linux/mm.h> +#include <linux/scatterlist.h> #include <asm/cacheflush.h> -#include <asm/scatterlist.h> /* See Documentation/DMA-API-HOWTO.txt */ struct hppa_dma_ops {
arch/parisc/include/asm/pci.h +1 -1
@@ -1,7 +1,7 @@#ifndef __ASM_PARISC_PCI_H#define __ASM_PARISC_PCI_H -#include <asm/scatterlist.h> +#include <linux/scatterlist.h>
arch/powerpc/include/asm/pci.h +1 -1
@@ -13,9 +13,9 @@#include <linux/slab.h> #include <linux/string.h> #include <linux/dma-mapping.h> +#include <linux/scatterlist.h> #include <asm/machdep.h> -#include <asm/scatterlist.h> #include <asm/io.h> #include <asm/prom.h> #include <asm/pci-bridge.h>
arch/powerpc/include/asm/vio.h +1 -1
@@ -19,9 +19,9 @@#include <linux/device.h> #include <linux/dma-mapping.h> #include <linux/mod_devicetable.h> +#include <linux/scatterlist.h> #include <asm/hvcall.h> -#include <asm/scatterlist.h> /* * Architecture-specific constants for drivers to
arch/sparc/kernel/iommu_common.h +1 -1
@@ -13,9 +13,9 @@#include <linux/scatterlist.h> #include <linux/device.h> #include <linux/iommu-helper.h> +#include <linux/scatterlist.h> #include <asm/iommu.h> -#include <asm/scatterlist.h> /* * These give mapping size of each iommu pte/tlb.
arch/x86/include/asm/pci.h +1 -1
@@ -5,7 +5,7 @@#include <linux/types.h> #include <linux/slab.h> #include <linux/string.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <asm/io.h> #include <asm/x86_init.h>
arch/xtensa/include/asm/pci.h +1 -1
@@ -33,7 +33,7 @@ extern struct pci_controller* pcibios_alloc_controller(void);#include <linux/types.h> #include <linux/slab.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <linux/string.h> #include <asm/io.h>
drivers/mmc/host/android-goldfish.c +1 -1
@@ -42,10 +42,10 @@#include <linux/spinlock.h> #include <linux/timer.h> #include <linux/clk.h> +#include <linux/scatterlist.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/scatterlist.h> #include <asm/types.h> #include <asm/io.h>
include/asm-generic/scatterlist.h deleted +0 -34
@@ -1,34 +0,0 @@ -#ifndef __ASM_GENERIC_SCATTERLIST_H -#define __ASM_GENERIC_SCATTERLIST_H - -#include <linux/types.h> - -struct scatterlist { -#ifdef CONFIG_DEBUG_SG -unsigned long sg_magic; -#endif -unsigned long page_link; -unsigned int offset; -unsigned int length; -dma_addr_t dma_address; -#ifdef CONFIG_NEED_SG_DMA_LENGTH -unsigned int dma_length; -#endif -}; - -/* -* These macros should be used after a dma_map_sg call has been done -* to get bus addresses of each of the SG entries and their lengths. -* You should only work with the number of sg entries pci_map_sg -* returns, or alternatively stop on the first sg_dma_len(sg) which -* is 0. -*/ -#define sg_dma_address (sg) ((sg)->dma_address) - -#ifdef CONFIG_NEED_SG_DMA_LENGTH -#define sg_dma_len (sg) ((sg)->dma_length) -#else -#define sg_dma_len (sg) ((sg)->length) -#endif - -#endif /* __ASM_GENERIC_SCATTERLIST_H */
include/linux/blkdev.h +1 -2
@@ -22,8 +22,7 @@#include <linux/smp.h> #include <linux/rcupdate.h> #include <linux/percpu-refcount.h> - -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> struct module ;struct scsi_ioctl_command ;
include/linux/dmapool.h +1 -1
@@ -11,8 +11,8 @@#ifndef LINUX_DMAPOOL_H #define LINUX_DMAPOOL_H +#include <linux/scatterlist.h> #include <asm/io.h> -#include <asm/scatterlist.h> struct device ;
include/linux/scatterlist.h +32 -7
@@ -2,13 +2,39 @@#define _LINUX_SCATTERLIST_H#include <linux/string.h> +#include <linux/types.h> #include <linux/bug.h> #include <linux/mm.h> - -#include <asm/types.h> -#include <asm/scatterlist.h> #include <asm/io.h> +struct scatterlist { +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif +unsigned long page_link; +unsigned int offset; +unsigned int length; +dma_addr_t dma_address; +#ifdef CONFIG_NEED_SG_DMA_LENGTH +unsigned int dma_length; +#endif +}; + +/* +* These macros should be used after a dma_map_sg call has been done +* to get bus addresses of each of the SG entries and their lengths. +* You should only work with the number of sg entries dma_map_sg +* returns, or alternatively stop on the first sg_dma_len(sg) which +* is 0. +*/ +#define sg_dma_address (sg) ((sg)->dma_address) + +#ifdef CONFIG_NEED_SG_DMA_LENGTH +#define sg_dma_len (sg) ((sg)->dma_length) +#else +#define sg_dma_len (sg) ((sg)->length) +#endif +struct sg_table {struct scatterlist *sgl;/* the list */ unsigned int nents;/* number of mapped entries */
@@ -18,10 +44,9 @@ struct sg_table {/* * Notes on SG table design. * -* Architectures must provide an unsigned long page_link field in the -* scatterlist struct. We use that to place the page pointer AND encode -* information about the sg table as well. The two lower bits are reserved -* for this information. +* We use the unsigned long page_link field in the scatterlist struct to place +* the page pointer AND encode information about the sg table as well. The two +* lower bits are reserved for this information. * * If bit 0 is set, then the page_link contains a pointer to the next sg * table list. Otherwise the next entry is at sg + 1.
lib/swiotlb.c +1 -1
@@ -29,10 +29,10 @@#include <linux/ctype.h> #include <linux/highmem.h> #include <linux/gfp.h> +#include <linux/scatterlist.h> #include <asm/io.h> #include <asm/dma.h> -#include <asm/scatterlist.h> #include <linux/init.h> #include <linux/bootmem.h>
Signature · 1 line
1.9.1
Jens Axboe
maintainerQuoted 2 lines · Christoph Hellwig
We don't have any arch specific scatterlist now that parisc switched over to the generic one.
Added for 4.2.
Signature · 1 line
Jens Axboe
Geert Uytterhoeven
maintainerQuoted 25 lines · Christoph Hellwig
We don't have any arch specific scatterlist now that parisc switched over to the generic one.
Signed-off-by Christoph Hellwig <[email protected]>--- arch/alpha/include/asm/pci.h | 2 +- arch/arm/include/asm/dma.h | 2 +- arch/arm/mach-footbridge/dma.c | 2 +- arch/blackfin/include/asm/pci.h | 2 +- arch/cris/include/asm/dma-mapping.h | 2 +- arch/cris/include/asm/pci.h | 2 +- arch/frv/include/asm/dma-mapping.h | 2 +- arch/frv/include/asm/pci.h | 2 +- arch/ia64/include/asm/pci.h | 2 +- arch/microblaze/include/asm/pci.h | 2 +- arch/mips/include/asm/dma-mapping.h | 2 +- arch/mips/include/asm/pci.h | 2 +- arch/mn10300/include/asm/pci.h | 2 +- arch/parisc/include/asm/dma-mapping.h | 2 +- arch/parisc/include/asm/pci.h | 2 +- arch/powerpc/include/asm/pci.h | 2 +- arch/powerpc/include/asm/vio.h | 2 +- arch/sparc/kernel/iommu_common.h | 2 +- arch/x86/include/asm/pci.h | 2 +- arch/xtensa/include/asm/pci.h | 2 +-
Quoted 8 lines
drivers/mmc/host/android-goldfish.c | 2 +- include/asm-generic/scatterlist.h | 34 ------------------------------ include/linux/blkdev.h | 3 +-- include/linux/dmapool.h | 2 +- include/linux/scatterlist.h | 39 ++++++++++++++++++++++++++++------- lib/swiotlb.c | 2 +- 26 files changed, 56 insertions(+), 66 deletions(-) delete mode 100644 include/asm-generic/scatterlist.h
If you remove include/asm-generic/scatterlist.h, you have to update the various Kbuild files referring to it:
$ git grep scatterlist.h -- "*Kbuild*" arch/alpha/include/asm/Kbuild:generic-y += scatterlist.h arch/arc/include/asm/Kbuild:generic-y += scatterlist.h arch/arm/include/asm/Kbuild:generic-y += scatterlist.h arch/arm64/include/asm/Kbuild:generic-y += scatterlist.h arch/avr32/include/asm/Kbuild:generic-y += scatterlist.h arch/blackfin/include/asm/Kbuild:generic-y += scatterlist.h arch/c6x/include/asm/Kbuild:generic-y += scatterlist.h arch/cris/include/asm/Kbuild:generic-y += scatterlist.h arch/frv/include/asm/Kbuild:generic-y += scatterlist.h arch/hexagon/include/asm/Kbuild:generic-y += scatterlist.h arch/ia64/include/asm/Kbuild:generic-y += scatterlist.h arch/m32r/include/asm/Kbuild:generic-y += scatterlist.h arch/m68k/include/asm/Kbuild:generic-y += scatterlist.h arch/metag/include/asm/Kbuild:generic-y += scatterlist.h arch/microblaze/include/asm/Kbuild:generic-y += scatterlist.h arch/mips/include/asm/Kbuild:generic-y += scatterlist.h arch/mn10300/include/asm/Kbuild:generic-y += scatterlist.h arch/nios2/include/asm/Kbuild:generic-y += scatterlist.h arch/openrisc/include/asm/Kbuild:generic-y += scatterlist.h arch/powerpc/include/asm/Kbuild:generic-y += scatterlist.h arch/s390/include/asm/Kbuild:generic-y += scatterlist.h arch/score/include/asm/Kbuild:generic-y += scatterlist.h arch/sh/include/asm/Kbuild:generic-y += scatterlist.h arch/sparc/include/asm/Kbuild:generic-y += scatterlist.h arch/tile/include/asm/Kbuild:generic-y += scatterlist.h arch/um/include/asm/Kbuild:generic-y += scatterlist.h arch/unicore32/include/asm/Kbuild:generic-y += scatterlist.h arch/x86/include/asm/Kbuild:generic-y += scatterlist.h arch/xtensa/include/asm/Kbuild:generic-y += scatterlist.h
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Quoted 2 lines · Geert Uytterhoeven
If you remove
include/asm-generic/scatterlist.h, you have to update the variousKbuildfiles referring to it:
Oh, I missed that and will fix it. But where does the missing removal actually show up? During a normal build on a few architectures nothing seemed to care.
Geert Uytterhoeven
maintainerQuoted 7 lines · Christoph Hellwig
Quoted 2 lines · Geert Uytterhoeven
If you remove
include/asm-generic/scatterlist.h, you have to update the variousKbuildfiles referring to it:Oh, I missed that and will fix it. But where does the missing removal actually show up? During a normal build on a few architectures nothing seemed to care.
There are indeed no errors or warnings from Kbuild if you remove a file from include/asm-generic. Only if you try to #include it, it will fail.
Ah, it just creates a file that includes the generic version, whether it exists or not:
$ cat arch/arm/include/generated/asm/scatterlist.h #include <asm-generic/scatterlist.h> $
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Ok, here is the Kbuild fix:
---
Quoted 1 line
From
273950b87bde0fa05944b60f3ed05c3b3c0f6601Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <[email protected]>
Date: Wed, 6 May 2015 07:17:09 +0200
Subject: remove scatterlist.h generation from arch Kbuild files
--- arch/alpha/include/asm/Kbuild | 1 - arch/arc/include/asm/Kbuild | 1 - arch/arm/include/asm/Kbuild | 1 - arch/arm64/include/asm/Kbuild | 1 - arch/avr32/include/asm/Kbuild | 1 - arch/blackfin/include/asm/Kbuild | 2 -- arch/c6x/include/asm/Kbuild | 1 - arch/cris/include/asm/Kbuild | 1 - arch/frv/include/asm/Kbuild | 1 - arch/hexagon/include/asm/Kbuild | 1 - arch/ia64/include/asm/Kbuild | 1 - arch/m32r/include/asm/Kbuild | 1 - arch/m68k/include/asm/Kbuild | 1 - arch/metag/include/asm/Kbuild | 1 - arch/microblaze/include/asm/Kbuild | 1 - arch/mips/include/asm/Kbuild | 1 - arch/mn10300/include/asm/Kbuild | 1 - arch/nios2/include/asm/Kbuild | 1 - arch/openrisc/include/asm/Kbuild | 1 - arch/parisc/include/asm/Kbuild | 1 - arch/powerpc/include/asm/Kbuild | 1 - arch/s390/include/asm/Kbuild | 1 - arch/score/include/asm/Kbuild | 1 - arch/sh/include/asm/Kbuild | 1 - arch/sparc/include/asm/Kbuild | 1 - arch/tile/include/asm/Kbuild | 1 - arch/um/include/asm/Kbuild | 2 -- arch/unicore32/include/asm/Kbuild | 1 - arch/x86/include/asm/Kbuild | 1 - arch/xtensa/include/asm/Kbuild | 1 - 30 files changed, 32 deletions(-)
arch/alpha/include/asm/Kbuild +0 -1
@@ -6,6 +6,5 @@ generic-y += exec.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += trace_clock.h
arch/arc/include/asm/Kbuild +0 -1
@@ -33,7 +33,6 @@ generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sembuf.h generic-y += shmbuf.h generic-y += siginfo.h
arch/arm/include/asm/Kbuild +0 -1
@@ -20,7 +20,6 @@ generic-y += poll.h generic-y += preempt.h generic-y += resource.h generic-y += rwsem.h -generic-y += scatterlist.h generic-y += seccomp.h generic-y += sections.h generic-y += segment.h
arch/arm64/include/asm/Kbuild +0 -1
@@ -35,7 +35,6 @@ generic-y += poll.h generic-y += preempt.h generic-y += resource.h generic-y += rwsem.h -generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += sembuf.h
arch/avr32/include/asm/Kbuild +0 -1
@@ -15,7 +15,6 @@ generic-y += mcs_spinlock.h generic-y += param.h generic-y += percpu.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += topology.h generic-y += trace_clock.h
arch/blackfin/include/asm/Kbuild +0 -2
@@ -28,8 +28,6 @@ generic-y += param.h generic-y += percpu.h generic-y += pgalloc.h generic-y += preempt.h -generic-y += resource.h -generic-y += scatterlist.h generic-y += sembuf.h generic-y += serial.h generic-y += setup.h
arch/c6x/include/asm/Kbuild +0 -1
@@ -38,7 +38,6 @@ generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += segment.h generic-y += sembuf.h generic-y += serial.h
arch/cris/include/asm/Kbuild +0 -1
@@ -21,7 +21,6 @@ generic-y += mcs_spinlock.h generic-y += module.h generic-y += percpu.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += topology.h generic-y += trace_clock.h
arch/frv/include/asm/Kbuild +0 -1
@@ -5,5 +5,4 @@ generic-y += exec.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += trace_clock.h
arch/hexagon/include/asm/Kbuild +0 -1
@@ -37,7 +37,6 @@ generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h generic-y += rwsem.h -generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += sembuf.h
arch/ia64/include/asm/Kbuild +0 -1
@@ -5,6 +5,5 @@ generic-y += irq_work.h generic-y += kvm_para.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += trace_clock.h generic-y += vtime.h
arch/m32r/include/asm/Kbuild +0 -1
@@ -6,6 +6,5 @@ generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += module.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += trace_clock.h
arch/m68k/include/asm/Kbuild +0 -1
@@ -23,7 +23,6 @@ generic-y += mutex.h generic-y += percpu.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sections.h generic-y += shmparam.h generic-y += siginfo.h
arch/metag/include/asm/Kbuild +0 -1
@@ -33,7 +33,6 @@ generic-y += percpu.h generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += sembuf.h generic-y += serial.h
arch/microblaze/include/asm/Kbuild +0 -1
@@ -7,6 +7,5 @@ generic-y += exec.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += syscalls.h generic-y += trace_clock.h
arch/mips/include/asm/Kbuild +0 -1
@@ -11,7 +11,6 @@ generic-y += mutex.h generic-y += parport.h generic-y += percpu.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += serial.h
arch/mn10300/include/asm/Kbuild +0 -1
@@ -6,6 +6,5 @@ generic-y += exec.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += trace_clock.h
arch/nios2/include/asm/Kbuild +0 -1
@@ -40,7 +40,6 @@ generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += sembuf.h
arch/openrisc/include/asm/Kbuild +0 -1
@@ -45,7 +45,6 @@ generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += sembuf.h
arch/parisc/include/asm/Kbuild +0 -1
@@ -20,7 +20,6 @@ generic-y += param.h generic-y += percpu.h generic-y += poll.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += seccomp.h generic-y += segment.h generic-y += topology.h
arch/powerpc/include/asm/Kbuild +0 -1
@@ -6,6 +6,5 @@ generic-y += local64.h generic-y += mcs_spinlock.h generic-y += preempt.h generic-y += rwsem.h -generic-y += scatterlist.h generic-y += trace_clock.h generic-y += vtime.h
arch/s390/include/asm/Kbuild +0 -1
@@ -4,5 +4,4 @@ generic-y += clkdev.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += trace_clock.h
arch/score/include/asm/Kbuild +0 -1
@@ -8,7 +8,6 @@ generic-y += cputime.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += trace_clock.h generic-y += xor.h
arch/sh/include/asm/Kbuild +0 -1
@@ -24,7 +24,6 @@ generic-y += percpu.h generic-y += poll.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sembuf.h generic-y += serial.h generic-y += shmbuf.h
arch/sparc/include/asm/Kbuild +0 -1
@@ -15,7 +15,6 @@ generic-y += mcs_spinlock.h generic-y += module.h generic-y += mutex.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += serial.h generic-y += trace_clock.h generic-y += types.h
arch/tile/include/asm/Kbuild +0 -1
@@ -27,7 +27,6 @@ generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sembuf.h generic-y += serial.h generic-y += shmbuf.h
arch/um/include/asm/Kbuild +0 -2
@@ -20,8 +20,6 @@ generic-y += mutex.h generic-y += param.h generic-y += pci.h generic-y += percpu.h -generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += switch_to.h generic-y += topology.h
arch/unicore32/include/asm/Kbuild +0 -1
@@ -36,7 +36,6 @@ generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += sembuf.h
arch/x86/include/asm/Kbuild +0 -1
@@ -9,4 +9,3 @@ generic-y += cputime.h generic-y += dma-contiguous.h generic-y += early_ioremap.h generic-y += mcs_spinlock.h -generic-y += scatterlist.h
arch/xtensa/include/asm/Kbuild +0 -1
@@ -22,7 +22,6 @@ generic-y += mcs_spinlock.h generic-y += percpu.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sections.h generic-y += siginfo.h generic-y += statfs.h
Signature · 1 line
1.9.1
Geert Uytterhoeven
maintainerQuoted 23 lines · Christoph Hellwig
arch/alpha/include/asm/Kbuild | 1 - arch/arc/include/asm/Kbuild | 1 - arch/arm/include/asm/Kbuild | 1 - arch/arm64/include/asm/Kbuild | 1 - arch/avr32/include/asm/Kbuild | 1 - arch/blackfin/include/asm/Kbuild | 2 -- arch/c6x/include/asm/Kbuild | 1 - arch/cris/include/asm/Kbuild | 1 - arch/frv/include/asm/Kbuild | 1 - arch/hexagon/include/asm/Kbuild | 1 - arch/ia64/include/asm/Kbuild | 1 - arch/m32r/include/asm/Kbuild | 1 - arch/m68k/include/asm/Kbuild | 1 - arch/metag/include/asm/Kbuild | 1 - arch/microblaze/include/asm/Kbuild | 1 - arch/mips/include/asm/Kbuild | 1 - arch/mn10300/include/asm/Kbuild | 1 - arch/nios2/include/asm/Kbuild | 1 - arch/openrisc/include/asm/Kbuild | 1 - arch/parisc/include/asm/Kbuild | 1 - arch/powerpc/include/asm/Kbuild | 1 - arch/s390/include/asm/Kbuild | 1 - arch/score/include/asm/Kbuild | 1 -
Quoted 8 lines
arch/sh/include/asm/Kbuild | 1 - arch/sparc/include/asm/Kbuild | 1 - arch/tile/include/asm/Kbuild | 1 - arch/um/include/asm/Kbuild | 2 -- arch/unicore32/include/asm/Kbuild | 1 - arch/x86/include/asm/Kbuild | 1 - arch/xtensa/include/asm/Kbuild | 1 - 30 files changed, 32 deletions(-)
Woops, there are more lines deleted than one per file?
arch/blackfin/include/asm/Kbuild generic-y += param.h · line 31
Quoted 7 lines
arch/blackfin/include/asm/Kbuild +0
-1@@ -28,8 +28,6 @@ generic-y += param.h generic-y += percpu.h generic-y += pgalloc.h generic-y += preempt.h -generic-y += resource.h
???
arch/um/include/asm/Kbuild generic-y += mutex.h · line 23
Quoted 12 lines
arch/blackfin/include/asm/Kbuild +0
-1-generic-y += scatterlist.h generic-y += sembuf.h generic-y += serial.h generic-y += setup.harch/um/include/asm/Kbuild +0
-1@@ -20,8 +20,6 @@ generic-y += mutex.h generic-y += param.h generic-y += pci.h generic-y += percpu.h -generic-y += preempt.h
???
arch/um/include/asm/Kbuild generic-y += mutex.h · line 25
Quoted 4 lines
arch/um/include/asm/Kbuild +0
-1-generic-y += scatterlist.h generic-y += sections.h generic-y += switch_to.h generic-y += topology.h
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Quoted 7 lines · Geert Uytterhoeven
Quoted 1 line
30 files changed, 32 deletions(-)Woops, there are more lines deleted than one per file?
???
???
So much for sending patches after a way too short night and without coffee in the morning. Sorry..
Next try, straight from the coffee shop :)
---
Quoted 1 line
From
e87704c5d501be42b2047bda3760dfd6cdcfba13Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <[email protected]>
Date: Wed, 6 May 2015 07:17:09 +0200
Subject: remove scatterlist.h generation from arch Kbuild files
--- arch/alpha/include/asm/Kbuild | 1 - arch/arc/include/asm/Kbuild | 1 - arch/arm/include/asm/Kbuild | 1 - arch/arm64/include/asm/Kbuild | 1 - arch/avr32/include/asm/Kbuild | 1 - arch/blackfin/include/asm/Kbuild | 1 - arch/c6x/include/asm/Kbuild | 1 - arch/cris/include/asm/Kbuild | 1 - arch/frv/include/asm/Kbuild | 1 - arch/hexagon/include/asm/Kbuild | 1 - arch/ia64/include/asm/Kbuild | 1 - arch/m32r/include/asm/Kbuild | 1 - arch/m68k/include/asm/Kbuild | 1 - arch/metag/include/asm/Kbuild | 1 - arch/microblaze/include/asm/Kbuild | 1 - arch/mips/include/asm/Kbuild | 1 - arch/mn10300/include/asm/Kbuild | 1 - arch/nios2/include/asm/Kbuild | 1 - arch/openrisc/include/asm/Kbuild | 1 - arch/parisc/include/asm/Kbuild | 1 - arch/powerpc/include/asm/Kbuild | 1 - arch/s390/include/asm/Kbuild | 1 - arch/score/include/asm/Kbuild | 1 - arch/sh/include/asm/Kbuild | 1 - arch/sparc/include/asm/Kbuild | 1 - arch/tile/include/asm/Kbuild | 1 - arch/um/include/asm/Kbuild | 1 - arch/unicore32/include/asm/Kbuild | 1 - arch/x86/include/asm/Kbuild | 1 - arch/xtensa/include/asm/Kbuild | 1 - 30 files changed, 30 deletions(-)
arch/alpha/include/asm/Kbuild +0 -1
@@ -6,6 +6,5 @@ generic-y += exec.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += trace_clock.h
arch/arc/include/asm/Kbuild +0 -1
@@ -33,7 +33,6 @@ generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sembuf.h generic-y += shmbuf.h generic-y += siginfo.h
arch/arm/include/asm/Kbuild +0 -1
@@ -20,7 +20,6 @@ generic-y += poll.h generic-y += preempt.h generic-y += resource.h generic-y += rwsem.h -generic-y += scatterlist.h generic-y += seccomp.h generic-y += sections.h generic-y += segment.h
arch/arm64/include/asm/Kbuild +0 -1
@@ -35,7 +35,6 @@ generic-y += poll.h generic-y += preempt.h generic-y += resource.h generic-y += rwsem.h -generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += sembuf.h
arch/avr32/include/asm/Kbuild +0 -1
@@ -15,7 +15,6 @@ generic-y += mcs_spinlock.h generic-y += param.h generic-y += percpu.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += topology.h generic-y += trace_clock.h
arch/blackfin/include/asm/Kbuild +0 -1
@@ -29,7 +29,6 @@ generic-y += percpu.h generic-y += pgalloc.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sembuf.h generic-y += serial.h generic-y += setup.h
arch/c6x/include/asm/Kbuild +0 -1
@@ -38,7 +38,6 @@ generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += segment.h generic-y += sembuf.h generic-y += serial.h
arch/cris/include/asm/Kbuild +0 -1
@@ -21,7 +21,6 @@ generic-y += mcs_spinlock.h generic-y += module.h generic-y += percpu.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += topology.h generic-y += trace_clock.h
arch/frv/include/asm/Kbuild +0 -1
@@ -5,5 +5,4 @@ generic-y += exec.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += trace_clock.h
arch/hexagon/include/asm/Kbuild +0 -1
@@ -37,7 +37,6 @@ generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h generic-y += rwsem.h -generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += sembuf.h
arch/ia64/include/asm/Kbuild +0 -1
@@ -5,6 +5,5 @@ generic-y += irq_work.h generic-y += kvm_para.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += trace_clock.h generic-y += vtime.h
arch/m32r/include/asm/Kbuild +0 -1
@@ -6,6 +6,5 @@ generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += module.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += trace_clock.h
arch/m68k/include/asm/Kbuild +0 -1
@@ -23,7 +23,6 @@ generic-y += mutex.h generic-y += percpu.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sections.h generic-y += shmparam.h generic-y += siginfo.h
arch/metag/include/asm/Kbuild +0 -1
@@ -33,7 +33,6 @@ generic-y += percpu.h generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += sembuf.h generic-y += serial.h
arch/microblaze/include/asm/Kbuild +0 -1
@@ -7,6 +7,5 @@ generic-y += exec.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += syscalls.h generic-y += trace_clock.h
arch/mips/include/asm/Kbuild +0 -1
@@ -11,7 +11,6 @@ generic-y += mutex.h generic-y += parport.h generic-y += percpu.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += serial.h
arch/mn10300/include/asm/Kbuild +0 -1
@@ -6,6 +6,5 @@ generic-y += exec.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += trace_clock.h
arch/nios2/include/asm/Kbuild +0 -1
@@ -40,7 +40,6 @@ generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += sembuf.h
arch/openrisc/include/asm/Kbuild +0 -1
@@ -45,7 +45,6 @@ generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += sembuf.h
arch/parisc/include/asm/Kbuild +0 -1
@@ -20,7 +20,6 @@ generic-y += param.h generic-y += percpu.h generic-y += poll.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += seccomp.h generic-y += segment.h generic-y += topology.h
arch/powerpc/include/asm/Kbuild +0 -1
@@ -6,6 +6,5 @@ generic-y += local64.h generic-y += mcs_spinlock.h generic-y += preempt.h generic-y += rwsem.h -generic-y += scatterlist.h generic-y += trace_clock.h generic-y += vtime.h
arch/s390/include/asm/Kbuild +0 -1
@@ -4,5 +4,4 @@ generic-y += clkdev.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += trace_clock.h
arch/score/include/asm/Kbuild +0 -1
@@ -8,7 +8,6 @@ generic-y += cputime.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += trace_clock.h generic-y += xor.h
arch/sh/include/asm/Kbuild +0 -1
@@ -24,7 +24,6 @@ generic-y += percpu.h generic-y += poll.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sembuf.h generic-y += serial.h generic-y += shmbuf.h
arch/sparc/include/asm/Kbuild +0 -1
@@ -15,7 +15,6 @@ generic-y += mcs_spinlock.h generic-y += module.h generic-y += mutex.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += serial.h generic-y += trace_clock.h generic-y += types.h
arch/tile/include/asm/Kbuild +0 -1
@@ -27,7 +27,6 @@ generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sembuf.h generic-y += serial.h generic-y += shmbuf.h
arch/um/include/asm/Kbuild +0 -1
@@ -21,7 +21,6 @@ generic-y += param.h generic-y += pci.h generic-y += percpu.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += sections.h generic-y += switch_to.h generic-y += topology.h
arch/unicore32/include/asm/Kbuild +0 -1
@@ -36,7 +36,6 @@ generic-y += poll.h generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += sembuf.h
arch/x86/include/asm/Kbuild +0 -1
@@ -9,4 +9,3 @@ generic-y += cputime.h generic-y += dma-contiguous.h generic-y += early_ioremap.h generic-y += mcs_spinlock.h -generic-y += scatterlist.h
arch/xtensa/include/asm/Kbuild +0 -1
@@ -22,7 +22,6 @@ generic-y += mcs_spinlock.h generic-y += percpu.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sections.h generic-y += siginfo.h generic-y += statfs.h
Signature · 1 line
1.9.1