Merge tag 'powerpc-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
Pull powerpc updates from Michael Ellerman: - Update of all defconfigs - Addition of a bunch of config options to modernise our defconfigs - Some PS3 updates from Geoff - Optimised memcmp for 64 bit from Anton - Fix for kprobes that allows 'perf probe' to work from Naveen - Several cxl updates from Ian & Ryan - Expanded support for the '24x7' PMU from Cody & Sukadev - Freescale updates from Scott: "Highlights include 8xx optimizations, some more work on datapath device tree content, e300 machine check support, t1040 corenet error reporting, and various cleanups and fixes" * tag 'powerpc-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (102 commits) cxl: Add missing return statement after handling AFU errror cxl: Fail AFU initialisation if an invalid configuration record is found cxl: Export optional AFU configuration record in sysfs powerpc/mm: Warn on flushing tlb page in kernel context powerpc/powernv: Add OPAL soft-poweroff routine powerpc/perf/hv-24x7: Document sysfs event description entries powerpc/perf/hv-gpci: add the remaining gpci requests powerpc/perf/{hv-gpci, hv-common}: generate requests with counters annotated powerpc/perf/hv-24x7: parse catalog and populate sysfs with events perf: define EVENT_DEFINE_RANGE_FORMAT_LITE helper perf: add PMU_EVENT_ATTR_STRING() helper perf: provide sysfs_show for struct perf_pmu_events_attr powerpc/kernel: Avoid initializing device-tree pointer twice powerpc: Remove old compile time disabled syscall tracing code powerpc/kernel: Make syscall_exit a local label cxl: Fix device_node reference counting powerpc/mm: bail out early when flushing TLB page powerpc: defconfigs: add MTD_SPI_NOR (new dependency for M25P80) perf/powerpc: reset event hw state when adding it to the PMU powerpc/qe: Use strlcpy() ...
Этот коммит содержится в:
@@ -25,6 +25,7 @@
|
||||
#include <linux/irq.h>
|
||||
#include <linux/bug.h>
|
||||
#include <linux/nmi.h>
|
||||
#include <linux/ctype.h>
|
||||
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/string.h>
|
||||
@@ -183,14 +184,6 @@ extern void xmon_leave(void);
|
||||
#define GETWORD(v) (((v)[0] << 24) + ((v)[1] << 16) + ((v)[2] << 8) + (v)[3])
|
||||
#endif
|
||||
|
||||
#define isxdigit(c) (('0' <= (c) && (c) <= '9') \
|
||||
|| ('a' <= (c) && (c) <= 'f') \
|
||||
|| ('A' <= (c) && (c) <= 'F'))
|
||||
#define isalnum(c) (('0' <= (c) && (c) <= '9') \
|
||||
|| ('a' <= (c) && (c) <= 'z') \
|
||||
|| ('A' <= (c) && (c) <= 'Z'))
|
||||
#define isspace(c) (c == ' ' || c == '\t' || c == 10 || c == 13 || c == 0)
|
||||
|
||||
static char *help_string = "\
|
||||
Commands:\n\
|
||||
b show breakpoints\n\
|
||||
@@ -2165,9 +2158,6 @@ static void dump_pacas(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
#define isxdigit(c) (('0' <= (c) && (c) <= '9') \
|
||||
|| ('a' <= (c) && (c) <= 'f') \
|
||||
|| ('A' <= (c) && (c) <= 'F'))
|
||||
static void
|
||||
dump(void)
|
||||
{
|
||||
@@ -2570,7 +2560,7 @@ scanhex(unsigned long *vp)
|
||||
int i;
|
||||
for (i=0; i<63; i++) {
|
||||
c = inchar();
|
||||
if (isspace(c)) {
|
||||
if (isspace(c) || c == '\0') {
|
||||
termch = c;
|
||||
break;
|
||||
}
|
||||
|
Ссылка в новой задаче
Block a user