]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native...
authorGuan Xuetao <gxt@mprc.pku.edu.cn>
Thu, 14 Jun 2012 03:38:25 +0000 (11:38 +0800)
committerZefan Li <lizefan@huawei.com>
Thu, 25 Sep 2014 03:49:18 +0000 (11:49 +0800)
commit4e36063eb13e743f1fdac0a65055c3f5fe28e387
treede75799127880ca1053e7821df9597e0bf518e65
parent62cdcceec9ccfac48f59bd03a258f91cb9700f45
UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler

commit 10e1e99e55378a65529c48753703c069aebce7af upstream.

For kernel/bound.c being compiled by native compiler, it will generate following errors in gcc 4.4.3:
  CC      kernel/bounds.s
In file included from include/linux/bug.h:4,
                 from include/linux/page-flags.h:9,
                 from kernel/bounds.c:9:
arch/unicore32/include/asm/bug.h:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
arch/unicore32/include/asm/bug.h:23: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'

So, we moved definitions in asm/bug.h to arch/unicore32/kernel/setup.h to solve the problem.

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Zefan Li <lizefan@huawei.com>
arch/unicore32/include/asm/bug.h
arch/unicore32/kernel/setup.h