Commit 6b5cbfd9 authored by Linus Torvalds's avatar Linus Torvalds Committed by Linus Torvalds

Use '#ifdef' to test for CONFIG_xxx variables, instead of

depending on undefined preprocessor symbols evaluating to zero.

Make panic.c use proper function prototypes.
parent 5a3ff5c4
......@@ -141,7 +141,7 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address)
{
struct page *pte;
#if CONFIG_HIGHPTE
#ifdef CONFIG_HIGHPTE
pte = alloc_pages(GFP_KERNEL|__GFP_HIGHMEM|__GFP_REPEAT, 0);
#else
pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0);
......@@ -151,7 +151,7 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address)
return pte;
}
#if CONFIG_X86_PAE
#ifdef CONFIG_X86_PAE
pgd_t *pgd_alloc(struct mm_struct *mm)
{
......
......@@ -27,7 +27,7 @@ struct nfs_server {
char * hostname; /* remote hostname */
struct nfs_fh fh;
struct sockaddr_in addr;
#if CONFIG_NFS_V4
#ifdef CONFIG_NFS_V4
/* Our own IP address, as a null-terminated string.
* This is used to generate the clientid, and the callback address.
*/
......
......@@ -110,7 +110,7 @@ NORET_TYPE void panic(const char * fmt, ...)
* The string is overwritten by the next call to print_taint().
*/
const char *print_tainted()
const char *print_tainted(void)
{
static char buf[20];
if (tainted) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment