openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] move fnptr definition inside #ifdef __KERNEL__
This commit is contained in:
Linus Torvalds 2010-01-08 13:57:19 -08:00
parent 0446e9d463 a651d80c71
commit d86527ddca
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/ia64/include/asm/types.h
View File

@ -30,16 +30,16 @@
typedef unsigned int umode_t;
struct fnptr {
unsigned long ip;
unsigned long gp;
};
/*
* These aren't exported outside the kernel to avoid name space clashes
*/
# ifdef __KERNEL__
struct fnptr {
unsigned long ip;
unsigned long gp;
};
/* DMA addresses are 64-bits wide, in general. */
typedef u64 dma_addr_t;