History

Merge branch 'akpm' (patches from Andrew)

Merge yet more updates from Andrew Morton: - a pile of minor fs fixes and cleanups - kexec updates - random misc fixes in various places: vmcore, rbtree, eventfd, ipc, seccomp. - a series of python-based kgdb helper scripts * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (58 commits) seccomp: cap SECCOMP_RET_ERRNO data to MAX_ERRNO samples/seccomp: improve label helper ipc,sem: use current->state helpers scripts/gdb: disable pagination while printing from breakpoint handler scripts/gdb: define maintainer scripts/gdb: convert CpuList to generator function scripts/gdb: convert ModuleList to generator function scripts/gdb: use a generator instead of iterator for task list scripts/gdb: ignore byte-compiled python files scripts/gdb: port to python3 / gdb7.7 scripts/gdb: add basic documentation scripts/gdb: add lx-lsmod command scripts/gdb: add class to iterate over CPU masks scripts/gdb: add lx_current convenience function scripts/gdb: add internal helper and convenience function for per-cpu lookup scripts/gdb: add get_gdbserver_type helper scripts/gdb: add internal helper and convenience function to retrieve thread_info scripts/gdb: add is_target_arch helper scripts/gdb: add helper and convenience function to look up tasks scripts/gdb: add task iteration class ...

Linus Torvalds committed 11 years ago

Commit e2b74f22 parents 9cd7737 580c57f43 files · +1185 −238Browse files

Showing the changes to include/uapi/linux (1 of 43 files). Show all

Unified · Split

include/uapi/linux/kexec.h+0−6
@@ -55,12 +55,6 @@ struct kexec_segment { · 54 unmodified lines
5555 size_t memsz;
5656 };
5757
58−/* Load a new kernel image as described by the kexec_segment array
59− * consisting of passed number of segments at the entry-point address.
60− * The flags allow different useage types.
61− */
62−extern int kexec_load(void *, size_t, struct kexec_segment *,
63− unsigned long int);
6458 #endif /* __KERNEL__ */
6559
6660 #endif /* _UAPILINUX_KEXEC_H */