diff options
-rw-r--r-- | sys/alpha/alpha/machdep.c | 18 | ||||
-rw-r--r-- | sys/amd64/amd64/machdep.c | 27 | ||||
-rw-r--r-- | sys/i386/i386/machdep.c | 27 | ||||
-rw-r--r-- | sys/ia64/ia64/machdep.c | 18 | ||||
-rw-r--r-- | sys/pc98/i386/machdep.c | 30 | ||||
-rw-r--r-- | sys/pc98/pc98/machdep.c | 30 | ||||
-rw-r--r-- | sys/powerpc/aim/machdep.c | 8 | ||||
-rw-r--r-- | sys/powerpc/powerpc/machdep.c | 8 |
8 files changed, 68 insertions, 98 deletions
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c index d2ebb83..b880b3a 100644 --- a/sys/alpha/alpha/machdep.c +++ b/sys/alpha/alpha/machdep.c @@ -203,32 +203,28 @@ vm_offset_t phys_avail[10]; static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = alpha_ptob(physmem); - error = sysctl_handle_long(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "LU", ""); static int sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = alpha_ptob(physmem - cnt.v_wire_count); - error = sysctl_handle_long(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_usermem, "LU", ""); -SYSCTL_INT(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); +SYSCTL_ULONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); /* must be 2 less so 0 0 can signal end of chunks */ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index f1bc522..0ad6576 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -158,41 +158,38 @@ static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = ctob(physmem); - error = sysctl_handle_int(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "LU", ""); static int sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = ctob(physmem - cnt.v_wire_count); - error = sysctl_handle_int(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_usermem, "LU", ""); static int sysctl_hw_availpages(SYSCTL_HANDLER_ARGS) { - int error = sysctl_handle_int(oidp, 0, - i386_btop(avail_end - avail_start), req); - return (error); + u_long val; + + val = i386_btop(avail_end - avail_start); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_INT|CTLFLAG_RD, - 0, 0, sysctl_hw_availpages, "I", ""); +SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_ULONG | CTLFLAG_RD, + 0, 0, sysctl_hw_availpages, "LU", ""); long Maxmem = 0; diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index f1bc522..0ad6576 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -158,41 +158,38 @@ static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = ctob(physmem); - error = sysctl_handle_int(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "LU", ""); static int sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = ctob(physmem - cnt.v_wire_count); - error = sysctl_handle_int(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_usermem, "LU", ""); static int sysctl_hw_availpages(SYSCTL_HANDLER_ARGS) { - int error = sysctl_handle_int(oidp, 0, - i386_btop(avail_end - avail_start), req); - return (error); + u_long val; + + val = i386_btop(avail_end - avail_start); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_INT|CTLFLAG_RD, - 0, 0, sysctl_hw_availpages, "I", ""); +SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_ULONG | CTLFLAG_RD, + 0, 0, sysctl_hw_availpages, "LU", ""); long Maxmem = 0; diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index 0c04a66..6e4cfb5 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -154,32 +154,28 @@ vm_offset_t phys_avail[100]; static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = ia64_ptob(physmem); - error = sysctl_handle_long(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "LU", ""); static int sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = ia64_ptob(physmem - cnt.v_wire_count); - error = sysctl_handle_long(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_usermem, "LU", ""); -SYSCTL_LONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); +SYSCTL_ULONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); /* must be 2 less so 0 0 can signal end of chunks */ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2) diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index e63b2e7..8e8f5c7 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -175,44 +175,38 @@ static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = ctob(physmem); - int error = sysctl_handle_int(oidp, &val, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "LU", ""); static int sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = ctob(physmem - cnt.v_wire_count); - int error = sysctl_handle_int(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_usermem, "LU", ""); static int sysctl_hw_availpages(SYSCTL_HANDLER_ARGS) { - int error; - long val; - + u_long val; + val = i386_btop(avail_end - avail_start); - error = sysctl_handle_int(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_LONG|CTLFLAG_RD, - 0, 0, sysctl_hw_availpages, "L", ""); +SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_ULONG | CTLFLAG_RD, + 0, 0, sysctl_hw_availpages, "LU", ""); long Maxmem = 0; #ifdef PC98 @@ -1535,7 +1529,7 @@ physmap_done: if (atop(physmap[physmap_idx + 1]) != Maxmem && (boothowto & RB_VERBOSE)) - printf("Physical memory use set to %uK\n", Maxmem * 4); + printf("Physical memory use set to %ldK\n", Maxmem * 4); /* * If Maxmem has been increased beyond what the system has detected, diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index e63b2e7..8e8f5c7 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -175,44 +175,38 @@ static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = ctob(physmem); - int error = sysctl_handle_int(oidp, &val, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "LU", ""); static int sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = ctob(physmem - cnt.v_wire_count); - int error = sysctl_handle_int(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_usermem, "LU", ""); static int sysctl_hw_availpages(SYSCTL_HANDLER_ARGS) { - int error; - long val; - + u_long val; + val = i386_btop(avail_end - avail_start); - error = sysctl_handle_int(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_LONG|CTLFLAG_RD, - 0, 0, sysctl_hw_availpages, "L", ""); +SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_ULONG | CTLFLAG_RD, + 0, 0, sysctl_hw_availpages, "LU", ""); long Maxmem = 0; #ifdef PC98 @@ -1535,7 +1529,7 @@ physmap_done: if (atop(physmap[physmap_idx + 1]) != Maxmem && (boothowto & RB_VERBOSE)) - printf("Physical memory use set to %uK\n", Maxmem * 4); + printf("Physical memory use set to %ldK\n", Maxmem * 4); /* * If Maxmem has been increased beyond what the system has detected, diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c index 00e9339..2cbf4f4 100644 --- a/sys/powerpc/aim/machdep.c +++ b/sys/powerpc/aim/machdep.c @@ -153,15 +153,13 @@ void osendsig(sig_t, int, sigset_t *, u_long); static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = ctob(physmem); - error = sysctl_handle_int(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "LU", ""); long Maxmem = 0; diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c index 00e9339..2cbf4f4 100644 --- a/sys/powerpc/powerpc/machdep.c +++ b/sys/powerpc/powerpc/machdep.c @@ -153,15 +153,13 @@ void osendsig(sig_t, int, sigset_t *, u_long); static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = ctob(physmem); - error = sysctl_handle_int(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "LU", ""); long Maxmem = 0; |