D23660.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D23660.diff
View Options

	Index: head/stand/efi/loader/main.c
	===================================================================
	--- head/stand/efi/loader/main.c
	+++ head/stand/efi/loader/main.c
	@@ -852,7 +852,11 @@
	}
	}

	-
	+caddr_t
	+ptov(uintptr_t x)
	+{
	+ return ((caddr_t)x);
	+}

	EFI_STATUS
	main(int argc, CHAR16 *argv[])
	Index: head/stand/i386/libi386/smbios.c
	===================================================================
	--- head/stand/i386/libi386/smbios.c
	+++ head/stand/i386/libi386/smbios.c
	@@ -28,16 +28,9 @@
	__FBSDID("$FreeBSD$");

	#include <stand.h>
	-#include <bootstrap.h>
	#include <sys/endian.h>

	-#ifdef EFI
	-/* In EFI, we don't need PTOV(). */
	-#define PTOV(x) (caddr_t)(x)
	-#else
	-#include "btxv86.h"
	-#endif
	-#include "smbios.h"
	+#define PTOV(x) ptov(x)

	/*
	* Detect SMBIOS and export information about the SMBIOS into the
	Index: head/stand/i386/loader/main.c
	===================================================================
	--- head/stand/i386/loader/main.c
	+++ head/stand/i386/loader/main.c
	@@ -86,6 +86,12 @@
	static void *heap_top;
	static void *heap_bottom;

	+caddr_t
	+ptov(uintptr_t x)
	+{
	+ return (PTOV(x));
	+}
	+
	int
	main(void)
	{
	Index: head/stand/libsa/stand.h
	===================================================================
	--- head/stand/libsa/stand.h
	+++ head/stand/libsa/stand.h
	@@ -452,4 +452,9 @@
	#define reallocf(x, y) Reallocf(x, y, NULL, 0)
	#endif

	+/*
	+ * va <-> pa routines. MD code must supply.
	+ */
	+caddr_t ptov(uintptr_t);
	+
	#endif /* STAND_H */