Re: [PATCH 04/12] frv: remove km_type definitions

[Geert Uytterhoeven]

On Sat, Jun 23, 2012 at 12:04 PM, Cong Wang <amwang@xxxxxxxxxx> wrote:
> Signed-off-by: Cong Wang <amwang@xxxxxxxxxx>
> ---
> Âarch/frv/include/asm/kmap_types.h | Â 24 +-----------------------
> Â1 files changed, 1 insertions(+), 23 deletions(-)
>
> diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
> index f8e16b2..43901f2 100644
> --- a/arch/frv/include/asm/kmap_types.h
> +++ b/arch/frv/include/asm/kmap_types.h
> @@ -2,28 +2,6 @@
> Â#ifndef _ASM_KMAP_TYPES_H
> Â#define _ASM_KMAP_TYPES_H
>
> -enum km_type {
> - Â Â Â /* arch specific kmaps - change the numbers attached to these at your peril */
> - Â Â Â __KM_CACHE, Â Â Â Â Â Â /* cache flush page attachment point */
> - Â Â Â __KM_PGD, Â Â Â Â Â Â Â /* current page directory */
> - Â Â Â __KM_ITLB_PTD, Â Â Â Â Â/* current instruction TLB miss page table lookup */
> - Â Â Â __KM_DTLB_PTD, Â Â Â Â Â/* current data TLB miss page table lookup */
> -
> - Â Â Â /* general kmaps */
> - Â Â Â ÂKM_BOUNCE_READ,
> - Â Â Â ÂKM_SKB_SUNRPC_DATA,
> - Â Â Â ÂKM_SKB_DATA_SOFTIRQ,
> - Â Â Â ÂKM_USER0,
> - Â Â Â ÂKM_USER1,
> - Â Â Â KM_BIO_SRC_IRQ,
> - Â Â Â KM_BIO_DST_IRQ,
> - Â Â Â KM_PTE0,
> - Â Â Â KM_PTE1,
> - Â Â Â KM_IRQ0,
> - Â Â Â KM_IRQ1,
> - Â Â Â KM_SOFTIRQ0,
> - Â Â Â KM_SOFTIRQ1,
> - Â Â Â KM_TYPE_NR
> -};
> +#define KM_TYPE_NR 17
>
> Â#endif

"enum km_type" and "__KM_CACHE" are still used in
arch/frv/include/asm/highmem.h:

In file included from include/linux/highmem.h:34:0,
                 from include/linux/pagemap.h:10,
                 from include/linux/mempolicy.h:80,
                 from init/main.c:49:
arch/frv/include/asm/highmem.h:115:136: warning: 'enum km_type'
declared inside parameter list [enabled by default]
arch/frv/include/asm/highmem.h:115:136: warning: its scope is only
this definition or declaration, which is probably not what you want
[enabled by default]
arch/frv/include/asm/highmem.h:115:144: error: parameter 2 ('type')
has incomplete type
arch/frv/include/asm/highmem.h:115:92: warning: function declaration
isn't a prototype [-Wstrict-prototypes]
arch/frv/include/asm/highmem.h: In function 'kmap_atomic_primary':
arch/frv/include/asm/highmem.h:123:144: error: '__KM_CACHE' undeclared
(first use in this function)
arch/frv/include/asm/highmem.h:123:144: note: each undeclared
identifier is reported only once for each function it appears in
In file included from include/linux/highmem.h:34:0,
                 from include/linux/pagemap.h:10,
                 from include/linux/mempolicy.h:80,
                 from init/main.c:49:
arch/frv/include/asm/highmem.h: At top level:
arch/frv/include/asm/highmem.h:146:132: warning: 'enum km_type'
declared inside parameter list [enabled by default]
arch/frv/include/asm/highmem.h:146:140: error: parameter 2 ('type')
has incomplete type
arch/frv/include/asm/highmem.h:146:91: warning: function declaration
isn't a prototype [-Wstrict-prototypes]
arch/frv/include/asm/highmem.h: In function 'kunmap_atomic_primary':
arch/frv/include/asm/highmem.h:149:84: error: '__KM_CACHE' undeclared
(first use in this function)
make[1]: *** [init/main.o] Error 1

http://kisskb.ellerman.id.au/kisskb/buildresult/6592702/

Gr{oetje,eeting}s,

            Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
             Â Â -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/