[PATCH 1/3] ARM: CSR: Adding CSR SiRFprimaII board support

[Russell King - ARM Linux]

On Thu, Jul 07, 2011 at 03:21:06PM +0200, Arnd Bergmann wrote:
> What's left then are basically the headers. There is significant
> room for consolidation there, and I think most of them have been
> looked at by people before or are currently being worked on.
> Below is the complete diff between the headers of the two platforms
> as they are being proposed now.

Thanks for that.  diff -w might be a good idea on these to eliminate
changes due to whitespace differences.  It has found one thing which
should be fixed...

> diff -urN arch/arm/mach-prima2/include/mach/vmalloc.h arch/arm/mach-zynq/include/mach/vmalloc.h
> --- arch/arm/mach-prima2/include/mach/vmalloc.h	2011-07-07 13:21:41.000000000 +0000
> +++ arch/arm/mach-zynq/include/mach/vmalloc.h	2011-07-07 13:22:07.000000000 +0000
> @@ -1,14 +1,20 @@
> -/*
> - * arch/arm/ach-prima2/include/mach/vmalloc.h
> +/* arch/arm/mach-zynq/include/mach/vmalloc.h
>   *
> - * Copyright (c) 2010 – 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
> + *  Copyright (C) 2011 Xilinx
>   *
> - * Licensed under GPLv2 or later.
> + * This software is licensed under the terms of the GNU General Public
> + * License version 2, as published by the Free Software Foundation, and
> + * may be copied, distributed, and modified under those terms.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
>   */
>  
> -#ifndef __MACH_VMALLOC_H
> -#define __MACH_VMALLOC_H
> +#ifndef __MACH_VMALLOC_H__
> +#define __MACH_VMALLOC_H__
>  
> -#define VMALLOC_END	0xFEC00000
> +#define VMALLOC_END       0xE0000000UL

Prima2 should add a UL suffix to VMALLOC_END to ensure that it is
properly typed.