Kelly Daly
b420677870
merge filename and modify references to iseries/vio.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 15:13:57 +11:00
Kelly Daly
bbc8b628b0
merge filename and modify references to iSeries/mf.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 15:10:38 +11:00
Kelly Daly
6cbbdabb01
merge filename and modify references to iseries/iseries_io.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 15:07:51 +11:00
Kelly Daly
c43a55ff4e
merge filename and modify references to iseries/lpar_map.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 15:02:47 +11:00
Kelly Daly
59ce20bb34
merge filename and modify references to iseries/it_lp_reg_save.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 14:49:47 +11:00
Kelly Daly
8875ccfb7a
merge filename and modify references to iseries/it_lp_queue.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 14:13:34 +11:00
Kelly Daly
f218aab5cf
merge filename and modify references to iseries/it_lp_naca.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 13:51:41 +11:00
Kelly Daly
7b487bb801
merge filename and modify references to iseries/it_exp_vpd_panel.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 13:48:25 +11:00
Kelly Daly
1ec65d76f3
merge filename and modify references to iseries/hv_types.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 13:46:07 +11:00
Kelly Daly
e45423eac2
merge filename and modify references to iseries/hv_lp_event.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 12:08:31 +11:00
Kelly Daly
15b1718948
merge filename and modify reference to iseries/hv_lp_config.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 11:55:28 +11:00
Kelly Daly
8021b8a776
merge filename and modify references to iseries/hv_call_xm.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 11:41:12 +11:00
Kelly Daly
50592f5d2a
merge filename and modify references to iseries/hv_call_sc.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 11:37:22 +11:00
Kelly Daly
c0a8d05c8a
merge filename and modify references to iseries/hv_call_event.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-02 11:11:11 +11:00
Kelly Daly
1da4403788
merge filename and modify references to iseries/hv_call.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com >
2005-11-01 16:59:20 +11:00
Paul Mackerras
e2f2e58e79
powerpc: import a fix from arch/ppc/mm/pgtable.c
...
... namely, the change to the 2-argument pte_alloc_kernel.
Signed-off-by: Paul Mackerras <paulus@samba.org >
2005-10-31 14:40:03 +11:00
Paul Mackerras
734d652480
powerpc: apply recent changes to merged code
...
Signed-off-by: Paul Mackerras <paulus@samba.org >
2005-10-31 13:57:01 +11:00
Paul Mackerras
23fd07750a
Merge ../linux-2.6 by hand
2005-10-31 13:37:12 +11:00
Paul Mackerras
bd787d438a
ppc: remove duplicate export of cur_cpu_spec
...
Signed-off-by: Paul Mackerras <paulus@samba.org >
2005-10-31 13:08:54 +11:00
Paul Mackerras
cf00a8d18b
powerpc: Fix bug arising from having multiple memory_limit variables
...
We had a static memory_limit in prom.c, and then another one defined
in setup_64.c and used in numa.c, which resulted in the kernel crashing
when mem=xxx was given on the command line. This puts the declaration
in system.h and the definition in mem.c. This also moves the
definition of tce_alloc_start/end out of setup_64.c.
Signed-off-by: Paul Mackerras <paulus@samba.org >
2005-10-31 13:07:02 +11:00
Linus Torvalds
ed28f96ac1
Merge master.kernel.org:/home/rmk/linux-2.6-serial
2005-10-30 17:48:37 -08:00
Linus Torvalds
1480d0a31d
Merge master.kernel.org:/home/rmk/linux-2.6-arm
2005-10-30 17:48:00 -08:00
Linus Torvalds
fc8e3d177f
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-10-30 17:47:00 -08:00
Pekka Enberg
ad2c1604da
[PATCH] fat: Remove duplicate directory scanning code
...
This patch removes duplicate directory scanning code from fs/fat/dir.c. The
two functions that share identical code are fat_readdirx() and
fat_search_long(). This patch also renames fat_readdirx to __fat_readdir().
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi >
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-10-30 17:37:32 -08:00
OGAWA Hirofumi
9131dd4256
[PATCH] fat: remove the unneeded vfat_find() in vfat_rename()
...
Now, vfat_rename() is using vfat_find() for sanity check. This removes that
sanity check, the cost of sanity check is too high.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-10-30 17:37:32 -08:00