diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-28 16:04:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-28 16:04:55 -0400 |
commit | ec3c07377bd87e24a9a17a352fa4771173d4638a (patch) | |
tree | b6ab626f5c82e13df5d83080e0eef919bd296ba1 /arch/tile/kernel | |
parent | f55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff) | |
parent | 35b90a2939a563df4b1f57f18dd925d6aa7cb38a (diff) |
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
Diffstat (limited to 'arch/tile/kernel')
-rw-r--r-- | arch/tile/kernel/kgdb.c | 16 | ||||
-rw-r--r-- | arch/tile/kernel/pci_gx.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/tile/kernel/kgdb.c b/arch/tile/kernel/kgdb.c index a506c2c28943..9247d6b562f4 100644 --- a/arch/tile/kernel/kgdb.c +++ b/arch/tile/kernel/kgdb.c | |||
@@ -126,15 +126,15 @@ void | |||
126 | sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task) | 126 | sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task) |
127 | { | 127 | { |
128 | struct pt_regs *thread_regs; | 128 | struct pt_regs *thread_regs; |
129 | const int NGPRS = TREG_LAST_GPR + 1; | ||
129 | 130 | ||
130 | if (task == NULL) | 131 | if (task == NULL) |
131 | return; | 132 | return; |
132 | 133 | ||
133 | /* Initialize to zero. */ | ||
134 | memset(gdb_regs, 0, NUMREGBYTES); | ||
135 | |||
136 | thread_regs = task_pt_regs(task); | 134 | thread_regs = task_pt_regs(task); |
137 | memcpy(gdb_regs, thread_regs, TREG_LAST_GPR * sizeof(unsigned long)); | 135 | memcpy(gdb_regs, thread_regs, NGPRS * sizeof(unsigned long)); |
136 | memset(&gdb_regs[NGPRS], 0, | ||
137 | (TILEGX_PC_REGNUM - NGPRS) * sizeof(unsigned long)); | ||
138 | gdb_regs[TILEGX_PC_REGNUM] = thread_regs->pc; | 138 | gdb_regs[TILEGX_PC_REGNUM] = thread_regs->pc; |
139 | gdb_regs[TILEGX_FAULTNUM_REGNUM] = thread_regs->faultnum; | 139 | gdb_regs[TILEGX_FAULTNUM_REGNUM] = thread_regs->faultnum; |
140 | } | 140 | } |
@@ -433,9 +433,9 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, | |||
433 | struct kgdb_arch arch_kgdb_ops; | 433 | struct kgdb_arch arch_kgdb_ops; |
434 | 434 | ||
435 | /* | 435 | /* |
436 | * kgdb_arch_init - Perform any architecture specific initalization. | 436 | * kgdb_arch_init - Perform any architecture specific initialization. |
437 | * | 437 | * |
438 | * This function will handle the initalization of any architecture | 438 | * This function will handle the initialization of any architecture |
439 | * specific callbacks. | 439 | * specific callbacks. |
440 | */ | 440 | */ |
441 | int kgdb_arch_init(void) | 441 | int kgdb_arch_init(void) |
@@ -447,9 +447,9 @@ int kgdb_arch_init(void) | |||
447 | } | 447 | } |
448 | 448 | ||
449 | /* | 449 | /* |
450 | * kgdb_arch_exit - Perform any architecture specific uninitalization. | 450 | * kgdb_arch_exit - Perform any architecture specific uninitialization. |
451 | * | 451 | * |
452 | * This function will handle the uninitalization of any architecture | 452 | * This function will handle the uninitialization of any architecture |
453 | * specific callbacks, for dynamic registration and unregistration. | 453 | * specific callbacks, for dynamic registration and unregistration. |
454 | */ | 454 | */ |
455 | void kgdb_arch_exit(void) | 455 | void kgdb_arch_exit(void) |
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c index 4c017d0d2de8..aa2b44cd8fd3 100644 --- a/arch/tile/kernel/pci_gx.c +++ b/arch/tile/kernel/pci_gx.c | |||
@@ -1326,7 +1326,7 @@ invalid_device: | |||
1326 | 1326 | ||
1327 | 1327 | ||
1328 | /* | 1328 | /* |
1329 | * See tile_cfg_read() for relevent comments. | 1329 | * See tile_cfg_read() for relevant comments. |
1330 | * Note that "val" is the value to write, not a pointer to that value. | 1330 | * Note that "val" is the value to write, not a pointer to that value. |
1331 | */ | 1331 | */ |
1332 | static int tile_cfg_write(struct pci_bus *bus, unsigned int devfn, int offset, | 1332 | static int tile_cfg_write(struct pci_bus *bus, unsigned int devfn, int offset, |