Skip to content

Commit

Permalink
arch: Use asm-generic/socket.h when possible
Browse files Browse the repository at this point in the history
Many architectures maintain an arch specific copy of the
file even though there are no differences with the asm-generic
one. Allow these architectures to use the generic one instead.

Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Cc: chris@zankel.net
Cc: fenghua.yu@intel.com
Cc: tglx@linutronix.de
Cc: schwidefsky@de.ibm.com
Cc: linux-ia64@vger.kernel.org
Cc: linux-xtensa@linux-xtensa.org
Cc: linux-s390@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Deepa Dinamani authored and David S. Miller committed Feb 3, 2019
1 parent fe0c72f commit 2edfd8e
Show file tree
Hide file tree
Showing 9 changed files with 5 additions and 366 deletions.
1 change: 1 addition & 0 deletions arch/ia64/include/uapi/asm/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ include include/uapi/asm-generic/Kbuild.asm

generated-y += unistd_64.h
generic-y += kvm_para.h
generic-y += socket.h
122 changes: 0 additions & 122 deletions arch/ia64/include/uapi/asm/socket.h

This file was deleted.

1 change: 1 addition & 0 deletions arch/s390/include/uapi/asm/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ include include/uapi/asm-generic/Kbuild.asm

generated-y += unistd_32.h
generated-y += unistd_64.h
generic-y += socket.h
119 changes: 0 additions & 119 deletions arch/s390/include/uapi/asm/socket.h

This file was deleted.

1 change: 1 addition & 0 deletions arch/x86/include/uapi/asm/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ include include/uapi/asm-generic/Kbuild.asm
generated-y += unistd_32.h
generated-y += unistd_64.h
generated-y += unistd_x32.h
generic-y += socket.h
1 change: 0 additions & 1 deletion arch/x86/include/uapi/asm/socket.h

This file was deleted.

1 change: 1 addition & 0 deletions arch/xtensa/include/asm/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ generic-y += percpu.h
generic-y += preempt.h
generic-y += rwsem.h
generic-y += sections.h
generic-y += socket.h
generic-y += topology.h
generic-y += trace_clock.h
generic-y += vga.h
Expand Down
1 change: 1 addition & 0 deletions arch/xtensa/include/uapi/asm/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ include include/uapi/asm-generic/Kbuild.asm

generated-y += unistd_32.h
generic-y += kvm_para.h
generic-y += socket.h
124 changes: 0 additions & 124 deletions arch/xtensa/include/uapi/asm/socket.h

This file was deleted.

0 comments on commit 2edfd8e

Please sign in to comment.