[uaccess] Reduce scope of included uaccess.h header

The uaccess.h header is no longer required for any code that touches
external ("user") memory, since such memory accesses are now performed
through pointer dereferences.  Reduce the number of files including
this header.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/x86/image/elfboot.c b/src/arch/x86/image/elfboot.c
index f662e366f16c26a0e7760489a132c2f82f5bad30..7f89e8b657064f3bed0dd07d0a3370870e04f83e 100644 (file)
--- a/src/arch/x86/image/elfboot.c
+++ b/src/arch/x86/image/elfboot.c
@@ -30,6 +30,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/elf.h>
 #include <ipxe/features.h>
 #include <ipxe/init.h>
+#include <ipxe/uaccess.h>
 
 /**
  * @file

diff --git a/src/arch/x86/image/pxe_image.c b/src/arch/x86/image/pxe_image.c
index 3e6cf726809df155313848719d4b8d530bc67b51..ccb3a7d9d99ff9d960e20af44293c1efad0a1aa3 100644 (file)
--- a/src/arch/x86/image/pxe_image.c
+++ b/src/arch/x86/image/pxe_image.c
@@ -34,7 +34,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <pxe.h>
 #include <pxe_call.h>
 #include <pic8259.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/image.h>
 #include <ipxe/segment.h>
 #include <ipxe/netdevice.h>

diff --git a/src/arch/x86/interface/pxe/pxe_file.c b/src/arch/x86/interface/pxe/pxe_file.c
index b934e8fefbd8c92d20035c982a08ea8c4f95ad10..997667ccf650f0d112a94211a071d0392686dc30 100644 (file)
--- a/src/arch/x86/interface/pxe/pxe_file.c
+++ b/src/arch/x86/interface/pxe/pxe_file.c
@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/posix_io.h>
 #include <ipxe/features.h>
 #include <pxe.h>

diff --git a/src/core/cachedhcp.c b/src/core/cachedhcp.c
index 1510f3321efc2a7149e9b39734a16e3a0fdbd058..eeb2fca5866b72f35388b6a3aea338d2c5e24578 100644 (file)
--- a/src/core/cachedhcp.c
+++ b/src/core/cachedhcp.c
@@ -31,6 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/init.h>
 #include <ipxe/netdevice.h>
 #include <ipxe/vlan.h>
+#include <ipxe/uaccess.h>
 #include <ipxe/cachedhcp.h>
 
 /** @file

diff --git a/src/core/downloader.c b/src/core/downloader.c
index 9950fe5e4a3785af16e1baf6a7992aa16b893aa9..1c638f5027819577d80d5b9f9b96eaf8b0c06fd3 100644 (file)
--- a/src/core/downloader.c
+++ b/src/core/downloader.c
@@ -31,7 +31,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/xfer.h>
 #include <ipxe/open.h>
 #include <ipxe/job.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/umalloc.h>
 #include <ipxe/image.h>
 #include <ipxe/xferbuf.h>

diff --git a/src/core/fbcon.c b/src/core/fbcon.c
index 43f73fbac46047737bb1eb882756f3ce31d5577d..ef158aec77a658eb090533aa20c2b312b99716ea 100644 (file)
--- a/src/core/fbcon.c
+++ b/src/core/fbcon.c
@@ -36,6 +36,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/ansiesc.h>
 #include <ipxe/image.h>
 #include <ipxe/pixbuf.h>
+#include <ipxe/uaccess.h>
 #include <ipxe/umalloc.h>
 #include <ipxe/console.h>
 #include <ipxe/fbcon.h>

diff --git a/src/core/image.c b/src/core/image.c
index a06466b7271bc071380d951515cb56ab75173fd4..b2bd0956b6faac4bd74400c1550fe13638a41d8e 100644 (file)
--- a/src/core/image.c
+++ b/src/core/image.c
@@ -33,6 +33,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <libgen.h>
 #include <syslog.h>
 #include <ipxe/list.h>
+#include <ipxe/uaccess.h>
 #include <ipxe/umalloc.h>
 #include <ipxe/uri.h>
 #include <ipxe/image.h>

diff --git a/src/drivers/bus/ecam.c b/src/drivers/bus/ecam.c
index 35556a8d9af257b725f07da7d4f01969d30b0d0f..976254c18d2239eeb1819b6c326f43d0f9712695 100644 (file)
--- a/src/drivers/bus/ecam.c
+++ b/src/drivers/bus/ecam.c
@@ -25,7 +25,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <string.h>
 #include <errno.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/ecam.h>
 
 /** @file

diff --git a/src/hci/commands/image_mem_cmd.c b/src/hci/commands/image_mem_cmd.c
index 5f83634617914b4117b64e97852f8e4be11745a2..fcd7666273e5de56d981a966cfb29e1f1cbf0b2d 100644 (file)
--- a/src/hci/commands/image_mem_cmd.c
+++ b/src/hci/commands/image_mem_cmd.c
@@ -24,6 +24,7 @@
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <getopt.h>
+#include <ipxe/uaccess.h>
 #include <ipxe/command.h>
 #include <ipxe/parseopt.h>
 #include <usr/imgmgmt.h>

diff --git a/src/image/elf.c b/src/image/elf.c
index 97e07f37f3004d940ce861a69c32ea0a5fa07930..8cbb610a64f0c89993eead52b10780d4c77c10ea 100644 (file)
--- a/src/image/elf.c
+++ b/src/image/elf.c
@@ -38,6 +38,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <elf.h>
 #include <ipxe/segment.h>
 #include <ipxe/image.h>
+#include <ipxe/uaccess.h>
 #include <ipxe/elf.h>
 
 /**

diff --git a/src/include/ipxe/dhcp.h b/src/include/ipxe/dhcp.h
index 51349efd9155f0c8563d62ba2010563dec541c18..4d68d3ca5f1607fecd102d6d96a2a5d0e3cc5b67 100644 (file)
--- a/src/include/ipxe/dhcp.h
+++ b/src/include/ipxe/dhcp.h
@@ -17,7 +17,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/tables.h>
 #include <ipxe/uuid.h>
 #include <ipxe/netdevice.h>
-#include <ipxe/uaccess.h>
 
 struct interface;
 struct dhcp_options;

diff --git a/src/include/ipxe/image.h b/src/include/ipxe/image.h
index fbf2b63b921c4137795fc8f5760fcf89c588b992..e0e70f36044d2e0806bcee7631dbcc22cd662f8e 100644 (file)
--- a/src/include/ipxe/image.h
+++ b/src/include/ipxe/image.h
@@ -12,7 +12,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <ipxe/tables.h>
 #include <ipxe/list.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/refcnt.h>
 
 struct uri;

diff --git a/src/include/ipxe/iomap.h b/src/include/ipxe/iomap.h
index b8ded38ef8d7367d6cc58ffcf48d1c08ee9476ee..7d1547d9cd96fe330fe74a05476b63741de31ddd 100644 (file)
--- a/src/include/ipxe/iomap.h
+++ b/src/include/ipxe/iomap.h
@@ -14,7 +14,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <stdint.h>
 #include <ipxe/api.h>
 #include <config/ioapi.h>
-#include <ipxe/uaccess.h>
 
 /**
  * Calculate static inline I/O mapping API function name

diff --git a/src/include/ipxe/iomap_virt.h b/src/include/ipxe/iomap_virt.h
index 731d083d5cbae38e4275e71f31913d237635750e..3dd66bd7553c3bf8acb74f040029454bcdc4cd57 100644 (file)
--- a/src/include/ipxe/iomap_virt.h
+++ b/src/include/ipxe/iomap_virt.h
@@ -10,6 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stddef.h>
+#include <ipxe/uaccess.h>
 
 #ifdef IOMAP_VIRT
 #define IOMAP_PREFIX_virt

diff --git a/src/include/ipxe/xen.h b/src/include/ipxe/xen.h
index 0fb8b7625e6d9c05f273c93c9b625f2399e393f0..382901ff32ebec882f019e3b6acb273611c58d2e 100644 (file)
--- a/src/include/ipxe/xen.h
+++ b/src/include/ipxe/xen.h
@@ -14,7 +14,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/bitops.h>
-#include <ipxe/uaccess.h>
 #include <xen/xen.h>
 #include <xen/event_channel.h>
 

diff --git a/src/interface/efi/efi_cmdline.c b/src/interface/efi/efi_cmdline.c
index d5ec6cee30b12f3c71bf9ba6f8bccf3070591150..8b9d8efde758ece176287fb799289b42dafcec7c 100644 (file)
--- a/src/interface/efi/efi_cmdline.c
+++ b/src/interface/efi/efi_cmdline.c
@@ -37,6 +37,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/init.h>
 #include <ipxe/image.h>
 #include <ipxe/script.h>
+#include <ipxe/uaccess.h>
 #include <ipxe/efi/efi.h>
 #include <ipxe/efi/efi_cmdline.h>
 

diff --git a/src/net/pccrc.c b/src/net/pccrc.c
index 29adc4b164e10e0eb23c1a6b3897a360fcd66d23..0db6e3cb5c17af87606cc0633c07fc265a8f2341 100644 (file)
--- a/src/net/pccrc.c
+++ b/src/net/pccrc.c
@@ -25,7 +25,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <errno.h>
 #include <assert.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/sha256.h>
 #include <ipxe/sha512.h>
 #include <ipxe/hmac.h>

diff --git a/src/usr/imgtrust.c b/src/usr/imgtrust.c
index 4eb631e7952a48ceb18e367c75761a38445d59c7..e60854c9f112920c71a9287abe39ab6c14561013 100644 (file)
--- a/src/usr/imgtrust.c
+++ b/src/usr/imgtrust.c
@@ -28,7 +28,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <errno.h>
 #include <time.h>
 #include <syslog.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/image.h>
 #include <ipxe/cms.h>
 #include <ipxe/validator.h>