Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af8713b7 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

selftests/userfaultfd: fix compiler warnings on 32-bit 



On 32-bit:

    userfaultfd.c: In function 'locking_thread':
    userfaultfd.c:152: warning: left shift count >= width of type
    userfaultfd.c: In function 'uffd_poll_thread':
    userfaultfd.c:295: warning: cast to pointer from integer of different size
    userfaultfd.c: In function 'uffd_read_thread':
    userfaultfd.c:332: warning: cast to pointer from integer of different size

Fix the shift warning by splitting the shift in two parts, and the
integer/pointer warnigns by adding intermediate casts to "unsigned long".

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 61e57c0c

tools/testing/selftests/vm/userfaultfd.c

+6 −3
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ static void *locking_thread(void *arg) 
			if (sizeof(page_nr) > sizeof(rand_nr)) {

				if (random_r(&rand, &rand_nr))

					fprintf(stderr, "random_r 2 error\n"), exit(1);

				page_nr |= ((unsigned long) rand_nr) << 32;

				page_nr |= (((unsigned long) rand_nr) << 16) <<

					   16;

			}

		} else

			page_nr += 1;
@@ -290,7 +291,8 @@ static void *uffd_poll_thread(void *arg) 
				msg.event), exit(1);

		if (msg.arg.pagefault.flags & UFFD_PAGEFAULT_FLAG_WRITE)

			fprintf(stderr, "unexpected write fault\n"), exit(1);

		offset = (char *)msg.arg.pagefault.address - area_dst;

		offset = (char *)(unsigned long)msg.arg.pagefault.address -

			 area_dst;

		offset &= ~(page_size-1);

		if (copy_page(offset))

			userfaults++;
@@ -327,7 +329,8 @@ static void *uffd_read_thread(void *arg) 
		if (bounces & BOUNCE_VERIFY &&

		    msg.arg.pagefault.flags & UFFD_PAGEFAULT_FLAG_WRITE)

			fprintf(stderr, "unexpected write fault\n"), exit(1);

		offset = (char *)msg.arg.pagefault.address - area_dst;

		offset = (char *)(unsigned long)msg.arg.pagefault.address -

			 area_dst;

		offset &= ~(page_size-1);

		if (copy_page(offset))

			(*this_cpu_userfaults)++;