Re: Fix up mmap of /dev/kmem

[Olaf Hering <olh@suse.de>]

 On Sat, Aug 13, Linux Kernel Mailing List wrote:

> tree e52389322e063c5b784ead6ec314503f7646c765
> parent 2da5bf80f754e28cc153362e5ed1edaa9740897a
> author Linus Torvalds <torvalds@g5.osdl.org> Sun, 14 Aug 2005 04:22:59 -0700
> committer Linus Torvalds <torvalds@g5.osdl.org> Sun, 14 Aug 2005 04:22:59 -0700
> 
> Fix up mmap of /dev/kmem
> 
> This leaves the issue of whether we should deprecate the whole thing (or
> if we should check the whole mmap range, for that matter) open. Just do
> the minimal fix for now.
> 
>  drivers/char/mem.c |   12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/char/mem.c b/drivers/char/mem.c
> --- a/drivers/char/mem.c
> +++ b/drivers/char/mem.c
> @@ -261,7 +261,11 @@ static int mmap_mem(struct file * file, 
>  
>  static int mmap_kmem(struct file * file, struct vm_area_struct * vma)
>  {
> -        unsigned long long val;
> +	unsigned long pfn;
> +
> +	/* Turn a kernel-virtual address into a physical page frame */
> +	pfn = __pa((u64)vma->vm_pgoff << PAGE_SHIFT) >> PAGE_SHIFT;
> +
>  	/*
>  	 * RED-PEN: on some architectures there is more mapped memory
>  	 * than available in mem_map which pfn_valid checks

make all ARCH=um SUBARCH=i386 V=1

This gives 

drivers/char/mem.c: In function 'mmap_kmem':
drivers/char/mem.c:267: error: invalid operands to binary <<



static int mmap_kmem(struct file * file, struct vm_area_struct * vma)
{
 unsigned long pfn;


 pfn = to_phys((void *) (unsigned long) (u64)vma->vm_pgoff << 12) >> 12;
# 276 "drivers/char/mem.c"
 if (!((pfn) < max_mapnr))
  return -5;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/