D58056.id181369.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D58056.id181369.diff
View Options

	diff --git a/sys/sys/_exterr.h b/sys/sys/_exterr.h
	--- a/sys/sys/_exterr.h
	+++ b/sys/sys/_exterr.h
	@@ -16,8 +16,8 @@
	struct kexterr {
	int error;
	const char *msg;
	- __uint64_t p1;
	- __uint64_t p2;
	+ __uint64ptr_t p1;
	+ __uint64ptr_t p2;
	unsigned cat;
	unsigned src_line;
	};
	diff --git a/sys/sys/_uexterror.h b/sys/sys/_uexterror.h
	--- a/sys/sys/_uexterror.h
	+++ b/sys/sys/_uexterror.h
	@@ -20,8 +20,8 @@
	__uint32_t src_line;
	__uint32_t flags;
	__uint32_t rsrv0;
	- __uint64_t p1;
	- __uint64_t p2;
	+ __uint64ptr_t p1;
	+ __uint64ptr_t p2;
	__uint64_t rsrv1[4];
	char msg[128];
	};
	diff --git a/sys/sys/exterrvar.h b/sys/sys/exterrvar.h
	--- a/sys/sys/exterrvar.h
	+++ b/sys/sys/exterrvar.h
	@@ -59,7 +59,7 @@

	#define _SET_ERROR2(eerror, mmsg, pp1, pp2) \
	exterr_set(eerror, EXTERR_CATEGORY, SET_ERROR_MSG(mmsg), \
	- (uintptr_t)(pp1), (uintptr_t)(pp2), __LINE__)
	+ (uint64ptr_t)(pp1), (uint64ptr_t)(pp2), __LINE__)
	#define _SET_ERROR0(eerror, mmsg) _SET_ERROR2(eerror, mmsg, 0, 0)
	#define _SET_ERROR1(eerror, mmsg, pp1) _SET_ERROR2(eerror, mmsg, pp1, 0)

	@@ -72,8 +72,8 @@
	void exterr_clear(struct kexterr *ke);
	void exterr_db_print(struct kexterr *ke);
	int exterr_set_from(const struct kexterr *ke);
	-int exterr_set(int eerror, int category, const char *mmsg, uintptr_t pp1,
	- uintptr_t pp2, int line);
	+int exterr_set(int eerror, int category, const char *mmsg, uint64ptr_t pp1,
	+ uint64ptr_t pp2, int line);
	int exterr_to_ue(struct thread td, struct uexterror ue);
	void ktrexterr(struct thread *td);