diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 09:10:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 09:10:13 -0700 |
| commit | 8568dae21e186fbb111bbe6583033a33fe26f83d (patch) | |
| tree | 8c4d1b93865d24a96ced4221a18a852b0367b495 /include | |
| parent | 713c0515a555952d53956196d47dec3a3ece860a (diff) | |
| parent | 8dd79cb1051723496bbdcea2247e49567cedb3ac (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] show_interrupts: prevent cpu hotplug when walking cpu_online_map.
[S390] smp: __smp_call_function_map vs cpu_online_map fix.
[S390] tape: Use ccw_dev_id to build cdev_id.
[S390] dasd: fix timeout handling in interrupt handler
[S390] s390dbf: Use const char * for dbf name.
[S390] dasd: Use const in busid functions.
[S390] blacklist.c: removed duplicated include
[S390] vmlogrdr: module initialization function should return negative errors
[S390] sparsemem vmemmap: initialize memmap.
[S390] Remove last traces of cio_msg=.
[S390] cio: Remove CCW_CMD_SUSPEND_RECONN in front of CCW_CMD_SET_PGID.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-s390/debug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-s390/debug.h b/include/asm-s390/debug.h index 335baf4fc64..9450ce6e32d 100644 --- a/include/asm-s390/debug.h +++ b/include/asm-s390/debug.h @@ -120,10 +120,10 @@ debug_entry_t* debug_exception_common(debug_info_t* id, int level, /* Debug Feature API: */ -debug_info_t* debug_register(char* name, int pages, int nr_areas, +debug_info_t *debug_register(const char *name, int pages, int nr_areas, int buf_size); -debug_info_t *debug_register_mode(char *name, int pages, int nr_areas, +debug_info_t *debug_register_mode(const char *name, int pages, int nr_areas, int buf_size, mode_t mode, uid_t uid, gid_t gid); |