Commit ec3c0737 authored by Linus Torvalds's avatar Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull arch/tile bugfixes from Chris Metcalf:
 "These include updates to MAINTAINERS, some comment spelling fixes, and
  a bugfix to the tile kgdb.c support"

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: Fix misspellings in comments.
  MAINTAINERS: update web link for tile architecture
  MAINTAINERS: update arch/tile maintainer email domain
  tile kgdb: fix bug in copy to gdb regs, and optimize memset
parents f55532a0 35b90a29
...@@ -11137,8 +11137,8 @@ F: include/uapi/linux/tipc*.h ...@@ -11137,8 +11137,8 @@ F: include/uapi/linux/tipc*.h
F: net/tipc/ F: net/tipc/
TILE ARCHITECTURE TILE ARCHITECTURE
M: Chris Metcalf <cmetcalf@ezchip.com> M: Chris Metcalf <cmetcalf@mellanox.com>
W: http://www.ezchip.com/scm/ W: http://www.mellanox.com/repository/solutions/tile-scm/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git
S: Supported S: Supported
F: arch/tile/ F: arch/tile/
......
...@@ -211,7 +211,7 @@ _gxio_mpipe_link_mac_t; ...@@ -211,7 +211,7 @@ _gxio_mpipe_link_mac_t;
* request shared data permission on the same link. * request shared data permission on the same link.
* *
* No more than one of ::GXIO_MPIPE_LINK_DATA, ::GXIO_MPIPE_LINK_NO_DATA, * No more than one of ::GXIO_MPIPE_LINK_DATA, ::GXIO_MPIPE_LINK_NO_DATA,
* or ::GXIO_MPIPE_LINK_EXCL_DATA may be specifed in a gxio_mpipe_link_open() * or ::GXIO_MPIPE_LINK_EXCL_DATA may be specified in a gxio_mpipe_link_open()
* call. If none are specified, ::GXIO_MPIPE_LINK_DATA is assumed. * call. If none are specified, ::GXIO_MPIPE_LINK_DATA is assumed.
*/ */
#define GXIO_MPIPE_LINK_DATA 0x00000001UL #define GXIO_MPIPE_LINK_DATA 0x00000001UL
...@@ -219,7 +219,7 @@ _gxio_mpipe_link_mac_t; ...@@ -219,7 +219,7 @@ _gxio_mpipe_link_mac_t;
/** Do not request data permission on the specified link. /** Do not request data permission on the specified link.
* *
* No more than one of ::GXIO_MPIPE_LINK_DATA, ::GXIO_MPIPE_LINK_NO_DATA, * No more than one of ::GXIO_MPIPE_LINK_DATA, ::GXIO_MPIPE_LINK_NO_DATA,
* or ::GXIO_MPIPE_LINK_EXCL_DATA may be specifed in a gxio_mpipe_link_open() * or ::GXIO_MPIPE_LINK_EXCL_DATA may be specified in a gxio_mpipe_link_open()
* call. If none are specified, ::GXIO_MPIPE_LINK_DATA is assumed. * call. If none are specified, ::GXIO_MPIPE_LINK_DATA is assumed.
*/ */
#define GXIO_MPIPE_LINK_NO_DATA 0x00000002UL #define GXIO_MPIPE_LINK_NO_DATA 0x00000002UL
...@@ -230,7 +230,7 @@ _gxio_mpipe_link_mac_t; ...@@ -230,7 +230,7 @@ _gxio_mpipe_link_mac_t;
* data permission on it, this open will fail. * data permission on it, this open will fail.
* *
* No more than one of ::GXIO_MPIPE_LINK_DATA, ::GXIO_MPIPE_LINK_NO_DATA, * No more than one of ::GXIO_MPIPE_LINK_DATA, ::GXIO_MPIPE_LINK_NO_DATA,
* or ::GXIO_MPIPE_LINK_EXCL_DATA may be specifed in a gxio_mpipe_link_open() * or ::GXIO_MPIPE_LINK_EXCL_DATA may be specified in a gxio_mpipe_link_open()
* call. If none are specified, ::GXIO_MPIPE_LINK_DATA is assumed. * call. If none are specified, ::GXIO_MPIPE_LINK_DATA is assumed.
*/ */
#define GXIO_MPIPE_LINK_EXCL_DATA 0x00000004UL #define GXIO_MPIPE_LINK_EXCL_DATA 0x00000004UL
...@@ -241,7 +241,7 @@ _gxio_mpipe_link_mac_t; ...@@ -241,7 +241,7 @@ _gxio_mpipe_link_mac_t;
* permission on the same link. * permission on the same link.
* *
* No more than one of ::GXIO_MPIPE_LINK_STATS, ::GXIO_MPIPE_LINK_NO_STATS, * No more than one of ::GXIO_MPIPE_LINK_STATS, ::GXIO_MPIPE_LINK_NO_STATS,
* or ::GXIO_MPIPE_LINK_EXCL_STATS may be specifed in a gxio_mpipe_link_open() * or ::GXIO_MPIPE_LINK_EXCL_STATS may be specified in a gxio_mpipe_link_open()
* call. If none are specified, ::GXIO_MPIPE_LINK_STATS is assumed. * call. If none are specified, ::GXIO_MPIPE_LINK_STATS is assumed.
*/ */
#define GXIO_MPIPE_LINK_STATS 0x00000008UL #define GXIO_MPIPE_LINK_STATS 0x00000008UL
...@@ -249,7 +249,7 @@ _gxio_mpipe_link_mac_t; ...@@ -249,7 +249,7 @@ _gxio_mpipe_link_mac_t;
/** Do not request stats permission on the specified link. /** Do not request stats permission on the specified link.
* *
* No more than one of ::GXIO_MPIPE_LINK_STATS, ::GXIO_MPIPE_LINK_NO_STATS, * No more than one of ::GXIO_MPIPE_LINK_STATS, ::GXIO_MPIPE_LINK_NO_STATS,
* or ::GXIO_MPIPE_LINK_EXCL_STATS may be specifed in a gxio_mpipe_link_open() * or ::GXIO_MPIPE_LINK_EXCL_STATS may be specified in a gxio_mpipe_link_open()
* call. If none are specified, ::GXIO_MPIPE_LINK_STATS is assumed. * call. If none are specified, ::GXIO_MPIPE_LINK_STATS is assumed.
*/ */
#define GXIO_MPIPE_LINK_NO_STATS 0x00000010UL #define GXIO_MPIPE_LINK_NO_STATS 0x00000010UL
...@@ -267,7 +267,7 @@ _gxio_mpipe_link_mac_t; ...@@ -267,7 +267,7 @@ _gxio_mpipe_link_mac_t;
* reset by other statistics programs. * reset by other statistics programs.
* *
* No more than one of ::GXIO_MPIPE_LINK_STATS, ::GXIO_MPIPE_LINK_NO_STATS, * No more than one of ::GXIO_MPIPE_LINK_STATS, ::GXIO_MPIPE_LINK_NO_STATS,
* or ::GXIO_MPIPE_LINK_EXCL_STATS may be specifed in a gxio_mpipe_link_open() * or ::GXIO_MPIPE_LINK_EXCL_STATS may be specified in a gxio_mpipe_link_open()
* call. If none are specified, ::GXIO_MPIPE_LINK_STATS is assumed. * call. If none are specified, ::GXIO_MPIPE_LINK_STATS is assumed.
*/ */
#define GXIO_MPIPE_LINK_EXCL_STATS 0x00000020UL #define GXIO_MPIPE_LINK_EXCL_STATS 0x00000020UL
...@@ -278,7 +278,7 @@ _gxio_mpipe_link_mac_t; ...@@ -278,7 +278,7 @@ _gxio_mpipe_link_mac_t;
* permission on the same link. * permission on the same link.
* *
* No more than one of ::GXIO_MPIPE_LINK_CTL, ::GXIO_MPIPE_LINK_NO_CTL, * No more than one of ::GXIO_MPIPE_LINK_CTL, ::GXIO_MPIPE_LINK_NO_CTL,
* or ::GXIO_MPIPE_LINK_EXCL_CTL may be specifed in a gxio_mpipe_link_open() * or ::GXIO_MPIPE_LINK_EXCL_CTL may be specified in a gxio_mpipe_link_open()
* call. If none are specified, ::GXIO_MPIPE_LINK_CTL is assumed. * call. If none are specified, ::GXIO_MPIPE_LINK_CTL is assumed.
*/ */
#define GXIO_MPIPE_LINK_CTL 0x00000040UL #define GXIO_MPIPE_LINK_CTL 0x00000040UL
...@@ -286,7 +286,7 @@ _gxio_mpipe_link_mac_t; ...@@ -286,7 +286,7 @@ _gxio_mpipe_link_mac_t;
/** Do not request control permission on the specified link. /** Do not request control permission on the specified link.
* *
* No more than one of ::GXIO_MPIPE_LINK_CTL, ::GXIO_MPIPE_LINK_NO_CTL, * No more than one of ::GXIO_MPIPE_LINK_CTL, ::GXIO_MPIPE_LINK_NO_CTL,
* or ::GXIO_MPIPE_LINK_EXCL_CTL may be specifed in a gxio_mpipe_link_open() * or ::GXIO_MPIPE_LINK_EXCL_CTL may be specified in a gxio_mpipe_link_open()
* call. If none are specified, ::GXIO_MPIPE_LINK_CTL is assumed. * call. If none are specified, ::GXIO_MPIPE_LINK_CTL is assumed.
*/ */
#define GXIO_MPIPE_LINK_NO_CTL 0x00000080UL #define GXIO_MPIPE_LINK_NO_CTL 0x00000080UL
...@@ -301,7 +301,7 @@ _gxio_mpipe_link_mac_t; ...@@ -301,7 +301,7 @@ _gxio_mpipe_link_mac_t;
* it prevents programs like mpipe-link from configuring the link. * it prevents programs like mpipe-link from configuring the link.
* *
* No more than one of ::GXIO_MPIPE_LINK_CTL, ::GXIO_MPIPE_LINK_NO_CTL, * No more than one of ::GXIO_MPIPE_LINK_CTL, ::GXIO_MPIPE_LINK_NO_CTL,
* or ::GXIO_MPIPE_LINK_EXCL_CTL may be specifed in a gxio_mpipe_link_open() * or ::GXIO_MPIPE_LINK_EXCL_CTL may be specified in a gxio_mpipe_link_open()
* call. If none are specified, ::GXIO_MPIPE_LINK_CTL is assumed. * call. If none are specified, ::GXIO_MPIPE_LINK_CTL is assumed.
*/ */
#define GXIO_MPIPE_LINK_EXCL_CTL 0x00000100UL #define GXIO_MPIPE_LINK_EXCL_CTL 0x00000100UL
...@@ -311,7 +311,7 @@ _gxio_mpipe_link_mac_t; ...@@ -311,7 +311,7 @@ _gxio_mpipe_link_mac_t;
* change the desired state of the link when it is closed or the process * change the desired state of the link when it is closed or the process
* exits. No more than one of ::GXIO_MPIPE_LINK_AUTO_UP, * exits. No more than one of ::GXIO_MPIPE_LINK_AUTO_UP,
* ::GXIO_MPIPE_LINK_AUTO_UPDOWN, ::GXIO_MPIPE_LINK_AUTO_DOWN, or * ::GXIO_MPIPE_LINK_AUTO_UPDOWN, ::GXIO_MPIPE_LINK_AUTO_DOWN, or
* ::GXIO_MPIPE_LINK_AUTO_NONE may be specifed in a gxio_mpipe_link_open() * ::GXIO_MPIPE_LINK_AUTO_NONE may be specified in a gxio_mpipe_link_open()
* call. If none are specified, ::GXIO_MPIPE_LINK_AUTO_UPDOWN is assumed. * call. If none are specified, ::GXIO_MPIPE_LINK_AUTO_UPDOWN is assumed.
*/ */
#define GXIO_MPIPE_LINK_AUTO_UP 0x00000200UL #define GXIO_MPIPE_LINK_AUTO_UP 0x00000200UL
...@@ -322,7 +322,7 @@ _gxio_mpipe_link_mac_t; ...@@ -322,7 +322,7 @@ _gxio_mpipe_link_mac_t;
* open, set the desired state of the link to down. No more than one of * open, set the desired state of the link to down. No more than one of
* ::GXIO_MPIPE_LINK_AUTO_UP, ::GXIO_MPIPE_LINK_AUTO_UPDOWN, * ::GXIO_MPIPE_LINK_AUTO_UP, ::GXIO_MPIPE_LINK_AUTO_UPDOWN,
* ::GXIO_MPIPE_LINK_AUTO_DOWN, or ::GXIO_MPIPE_LINK_AUTO_NONE may be * ::GXIO_MPIPE_LINK_AUTO_DOWN, or ::GXIO_MPIPE_LINK_AUTO_NONE may be
* specifed in a gxio_mpipe_link_open() call. If none are specified, * specified in a gxio_mpipe_link_open() call. If none are specified,
* ::GXIO_MPIPE_LINK_AUTO_UPDOWN is assumed. * ::GXIO_MPIPE_LINK_AUTO_UPDOWN is assumed.
*/ */
#define GXIO_MPIPE_LINK_AUTO_UPDOWN 0x00000400UL #define GXIO_MPIPE_LINK_AUTO_UPDOWN 0x00000400UL
...@@ -332,7 +332,7 @@ _gxio_mpipe_link_mac_t; ...@@ -332,7 +332,7 @@ _gxio_mpipe_link_mac_t;
* process has the link open, set the desired state of the link to down. * process has the link open, set the desired state of the link to down.
* No more than one of ::GXIO_MPIPE_LINK_AUTO_UP, * No more than one of ::GXIO_MPIPE_LINK_AUTO_UP,
* ::GXIO_MPIPE_LINK_AUTO_UPDOWN, ::GXIO_MPIPE_LINK_AUTO_DOWN, or * ::GXIO_MPIPE_LINK_AUTO_UPDOWN, ::GXIO_MPIPE_LINK_AUTO_DOWN, or
* ::GXIO_MPIPE_LINK_AUTO_NONE may be specifed in a gxio_mpipe_link_open() * ::GXIO_MPIPE_LINK_AUTO_NONE may be specified in a gxio_mpipe_link_open()
* call. If none are specified, ::GXIO_MPIPE_LINK_AUTO_UPDOWN is assumed. * call. If none are specified, ::GXIO_MPIPE_LINK_AUTO_UPDOWN is assumed.
*/ */
#define GXIO_MPIPE_LINK_AUTO_DOWN 0x00000800UL #define GXIO_MPIPE_LINK_AUTO_DOWN 0x00000800UL
...@@ -342,7 +342,7 @@ _gxio_mpipe_link_mac_t; ...@@ -342,7 +342,7 @@ _gxio_mpipe_link_mac_t;
* closed or the process exits. No more than one of * closed or the process exits. No more than one of
* ::GXIO_MPIPE_LINK_AUTO_UP, ::GXIO_MPIPE_LINK_AUTO_UPDOWN, * ::GXIO_MPIPE_LINK_AUTO_UP, ::GXIO_MPIPE_LINK_AUTO_UPDOWN,
* ::GXIO_MPIPE_LINK_AUTO_DOWN, or ::GXIO_MPIPE_LINK_AUTO_NONE may be * ::GXIO_MPIPE_LINK_AUTO_DOWN, or ::GXIO_MPIPE_LINK_AUTO_NONE may be
* specifed in a gxio_mpipe_link_open() call. If none are specified, * specified in a gxio_mpipe_link_open() call. If none are specified,
* ::GXIO_MPIPE_LINK_AUTO_UPDOWN is assumed. * ::GXIO_MPIPE_LINK_AUTO_UPDOWN is assumed.
*/ */
#define GXIO_MPIPE_LINK_AUTO_NONE 0x00001000UL #define GXIO_MPIPE_LINK_AUTO_NONE 0x00001000UL
......
...@@ -126,15 +126,15 @@ void ...@@ -126,15 +126,15 @@ void
sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task) sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task)
{ {
struct pt_regs *thread_regs; struct pt_regs *thread_regs;
const int NGPRS = TREG_LAST_GPR + 1;
if (task == NULL) if (task == NULL)
return; return;
/* Initialize to zero. */
memset(gdb_regs, 0, NUMREGBYTES);
thread_regs = task_pt_regs(task); thread_regs = task_pt_regs(task);
memcpy(gdb_regs, thread_regs, TREG_LAST_GPR * sizeof(unsigned long)); memcpy(gdb_regs, thread_regs, NGPRS * sizeof(unsigned long));
memset(&gdb_regs[NGPRS], 0,
(TILEGX_PC_REGNUM - NGPRS) * sizeof(unsigned long));
gdb_regs[TILEGX_PC_REGNUM] = thread_regs->pc; gdb_regs[TILEGX_PC_REGNUM] = thread_regs->pc;
gdb_regs[TILEGX_FAULTNUM_REGNUM] = thread_regs->faultnum; gdb_regs[TILEGX_FAULTNUM_REGNUM] = thread_regs->faultnum;
} }
...@@ -433,9 +433,9 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, ...@@ -433,9 +433,9 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,
struct kgdb_arch arch_kgdb_ops; struct kgdb_arch arch_kgdb_ops;
/* /*
* kgdb_arch_init - Perform any architecture specific initalization. * kgdb_arch_init - Perform any architecture specific initialization.
* *
* This function will handle the initalization of any architecture * This function will handle the initialization of any architecture
* specific callbacks. * specific callbacks.
*/ */
int kgdb_arch_init(void) int kgdb_arch_init(void)
...@@ -447,9 +447,9 @@ int kgdb_arch_init(void) ...@@ -447,9 +447,9 @@ int kgdb_arch_init(void)
} }
/* /*
* kgdb_arch_exit - Perform any architecture specific uninitalization. * kgdb_arch_exit - Perform any architecture specific uninitialization.
* *
* This function will handle the uninitalization of any architecture * This function will handle the uninitialization of any architecture
* specific callbacks, for dynamic registration and unregistration. * specific callbacks, for dynamic registration and unregistration.
*/ */
void kgdb_arch_exit(void) void kgdb_arch_exit(void)
......
...@@ -1326,7 +1326,7 @@ static int tile_cfg_read(struct pci_bus *bus, unsigned int devfn, int offset, ...@@ -1326,7 +1326,7 @@ static int tile_cfg_read(struct pci_bus *bus, unsigned int devfn, int offset,
/* /*
* See tile_cfg_read() for relevent comments. * See tile_cfg_read() for relevant comments.
* Note that "val" is the value to write, not a pointer to that value. * Note that "val" is the value to write, not a pointer to that value.
*/ */
static int tile_cfg_write(struct pci_bus *bus, unsigned int devfn, int offset, static int tile_cfg_write(struct pci_bus *bus, unsigned int devfn, int offset,
......
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