Skip to content

Commit

Permalink
tools/vm/page-types.c: cleanups
Browse files Browse the repository at this point in the history
Compiling page-type.c with a recent compiler produces many warnings,
mostly related to signed/unsigned comparisons.  This patch cleans up most
of them.

One remaining warning is about an unused parameter.  The <compiler.h> file
doesn't define a __unused macro (or the like) yet.  This can be addressed
later.

Signed-off-by: Ulrich Drepper <drepper@gmail.com>
Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Ulrich Drepper authored and Linus Torvalds committed May 29, 2012
1 parent 9295b7a commit e30d539
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions tools/vm/page-types.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ static char *page_flag_name(uint64_t flags)
{
static char buf[65];
int present;
int i, j;
size_t i, j;

for (i = 0, j = 0; i < ARRAY_SIZE(page_flag_names); i++) {
present = (flags >> i) & 1;
Expand All @@ -318,7 +318,7 @@ static char *page_flag_name(uint64_t flags)
static char *page_flag_longname(uint64_t flags)
{
static char buf[1024];
int i, n;
size_t i, n;

for (i = 0, n = 0; i < ARRAY_SIZE(page_flag_names); i++) {
if (!page_flag_names[i])
Expand Down Expand Up @@ -376,7 +376,7 @@ static void show_page(unsigned long voffset,

static void show_summary(void)
{
int i;
size_t i;

printf(" flags\tpage-count MB"
" symbolic-flags\t\t\tlong-symbolic-flags\n");
Expand Down Expand Up @@ -474,7 +474,7 @@ static int debugfs_valid_mountpoint(const char *debugfs)
/* find the path to the mounted debugfs */
static const char *debugfs_find_mountpoint(void)
{
const char **ptr;
const char *const *ptr;
char type[100];
FILE *fp;

Expand Down Expand Up @@ -511,7 +511,7 @@ static const char *debugfs_find_mountpoint(void)

static void debugfs_mount(void)
{
const char **ptr;
const char *const *ptr;

/* see if it's already mounted */
if (debugfs_find_mountpoint())
Expand Down Expand Up @@ -588,10 +588,10 @@ static int unpoison_page(unsigned long offset)
* page frame walker
*/

static int hash_slot(uint64_t flags)
static size_t hash_slot(uint64_t flags)
{
int k = HASH_KEY(flags);
int i;
size_t k = HASH_KEY(flags);
size_t i;

/* Explicitly reserve slot 0 for flags 0: the following logic
* cannot distinguish an unoccupied slot from slot (flags==0).
Expand Down Expand Up @@ -644,7 +644,7 @@ static void walk_pfn(unsigned long voffset,
{
uint64_t buf[KPAGEFLAGS_BATCH];
unsigned long batch;
long pages;
unsigned long pages;
unsigned long i;

while (count) {
Expand Down Expand Up @@ -753,7 +753,7 @@ static const char *page_flag_type(uint64_t flag)

static void usage(void)
{
int i, j;
size_t i, j;

printf(
"page-types [options]\n"
Expand Down Expand Up @@ -912,7 +912,7 @@ static void add_bits_filter(uint64_t mask, uint64_t bits)

static uint64_t parse_flag_name(const char *str, int len)
{
int i;
size_t i;

if (!*str || !len)
return 0;
Expand Down

0 comments on commit e30d539

Please sign in to comment.