Linus Torvalds
0016fe9d8a
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] Update generic config
[IA64] Fix uniprocessor build w.r.t. SGI_XP and SGI_GRU
[IA64] Eliminate trailing backquote in IA64_SGI_UV
[IA64] update generic_defconfig to support sn2.
[IA64] update generic_defconfig for 2.6.27-rc1
[IA64] Allow ia64 to CONFIG_NR_CPUS up to 4096
[IA64] Cleanup generated file not ignored by .gitignore
[IA64] pv_ops: fix ivt.S paravirtualization
2008-08-06 11:46:39 -07:00
Huang Weiyi
dc39778f95
drivers/misc/sgi-gru/grutlbpurge.c: removed duplicated #include
...
Removed duplicated include <linux/delay.h> in
drivers/misc/sgi-gru/grutlbpurge.c.
Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com >
Cc: Jack Steiner <steiner@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-08-05 14:33:49 -07:00
Tony Luck
ee694d6b41
[IA64] Fix uniprocessor build w.r.t. SGI_XP and SGI_GRU
...
The SGI XP and GRU drivers only work on SMP systems ... the Kconfig
file only disallowed them for non-SMP X86.
Signed-off-by: Tony Luck <tony.luck@intel.com >
2008-08-04 13:39:28 -07:00
Dean Nelson
46bd58eab2
add reverse dependency of CONFIG_SGI_XP upon CONFIG_SGI_GRU
...
Add a reverse dependency of CONFIG_SGI_XP upon CONFIG_SGI_GRU to Kconfig.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-08-01 12:26:03 -07:00
Dean Nelson
3b0de7b364
add dependency of CONFIG_SGI_XP upon CONFIG_NET
...
Add a dependency of CONFIG_SGI_XP upon CONFIG_NET to Kconfig.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-08-01 12:25:31 -07:00
Dean Nelson
bd3e64c175
sgi-xp: setup the notify GRU message queue
...
Setup the notify GRU message queue that is used for sending user messages
on UV systems.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Cc: Jack Steiner <steiner@sgi.com >
Cc: "Luck, Tony" <tony.luck@intel.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:50 -07:00
Dean Nelson
5b8669dfd1
sgi-xp: setup the activate GRU message queue
...
Setup the activate GRU message queue that is used for partition activation
and channel connection on UV systems.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Cc: Jack Steiner <steiner@sgi.com >
Cc: "Luck, Tony" <tony.luck@intel.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:50 -07:00
Dean Nelson
83469b5525
sgi-xp: cleanup naming of partition defines
...
Cleanup naming of partition defines.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Cc: Jack Steiner <steiner@sgi.com >
Cc: "Luck, Tony" <tony.luck@intel.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:50 -07:00
Dean Nelson
61deb86e98
sgi-xp: move xpc_check_remote_hb() to support both SN2 and UV
...
Move xpc_check_remote_hb() so it can support both SN2 and UV.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Cc: Jack Steiner <steiner@sgi.com >
Cc: "Luck, Tony" <tony.luck@intel.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:50 -07:00
Dean Nelson
a812dcc3a2
sgi-xp: add usage of GRU driver by xpc_remote_memcpy()
...
Add UV support to xpc_remote_memcpy(), which involves interfacing to the
GRU driver.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Cc: Jack Steiner <steiner@sgi.com >
Cc: "Luck, Tony" <tony.luck@intel.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:50 -07:00
Dean Nelson
261f3b4979
sgi-xp: enable building of XPC/XPNET on x86_64
...
Get XPC/XPNET to build on x86_64. Trying to modprobe them up on a non-UV
or sn2 system will result in a -ENODEV.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Cc: Jack Steiner <steiner@sgi.com >
Cc: "Luck, Tony" <tony.luck@intel.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:50 -07:00
Dean Nelson
81fe7883d2
sgi-xp: add 'jiffies' to reserved page's timestamp name
...
Rename XPC's reserved page's timestamp member to reflect the units of time
involved.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:50 -07:00
Dean Nelson
04de741885
sgi-xp: use standard bitops macros and functions
...
Change sgi-xp to use the standard bitops macros and functions instead of
trying to invent its own mechanism.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:50 -07:00
Dean Nelson
ea57f80c8c
sgi-xp: eliminate '>>>' in comments
...
Comments in /drivers/misc/sgi-xp has been using '>>>' as a means to draw
attention to something that needs to be done or considered. To avoid
colliding with git rejects, '>>>' will now be replaced by '!!!' to
indicate something to do, and by '???' to indicate something to be
considered.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:50 -07:00
Dean Nelson
8e85c23ef0
sgi-xp: add _sn2 suffix to a few variables
...
Add an '_sn2' suffix to some variables found in xpc_sn2.c.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:50 -07:00
Dean Nelson
ee6665e3b6
sgi-xp: isolate remote copy buffer to sn2 only
...
Make the remote copy buffer an sn2 only item.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:50 -07:00
Dean Nelson
a7b4d50920
sgi-xp: enable XPNET to handle more than 64 partitions
...
Enable XPNET to support more than 64 partitions.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:50 -07:00
Dean Nelson
185c3a1b4b
sgi-xp: isolate allocation of XPC's msgqueues to sn2 only
...
Move the allocation of XPC's msgqueues to xpc_sn2.c.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:49 -07:00
Dean Nelson
c39838ce21
sgi-xp: replace AMO_t typedef by struct amo
...
Replace the AMO_t typedef by a direct reference to 'struct amo'.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:49 -07:00
Dean Nelson
7fb5e59d63
sgi-xp: separate chctl_flags from XPC's notify IRQ
...
Tie current IPI references to either XPC's notify IRQ or channel control
flags.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:49 -07:00
Dean Nelson
a47d5dac9d
sgi-xp: isolate additional sn2 specific code
...
Move additional sn2 specific code into xpc_sn2.c.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:49 -07:00
Dean Nelson
6e41017aad
sgi-xp: isolate activate IRQ's hardware specific components
...
Isolate architecture specific code related to XPC's activate IRQ.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:49 -07:00
Dean Nelson
97bf1aa1e1
sgi-xp: move xpc_allocate() into xpc_send()/xpc_send_notify()
...
Move xpc_allocate() functionality into xpc_send()/xpc_send_notify() so
xpc_allocate() no longer needs to be called by XPNET.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:49 -07:00
Dean Nelson
aaa3cd694c
sgi-xp: base xpc_rsvd_page's timestamp on jiffies
...
Change XPC's reserved page timestamp to be based on jiffies.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:49 -07:00
Dean Nelson
33ba3c7724
sgi-xp: isolate xpc_vars structure to sn2 only
...
Isolate the xpc_vars structure of XPC's reserved page to sn2 only.
Signed-off-by: Dean Nelson <dcn@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-07-30 09:41:49 -07:00