diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-09-09 12:24:11 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-09-09 12:24:11 -0700 |
| commit | 46a416e609b67e4fe19faa9b66edc3594fbf8674 (patch) | |
| tree | ec3f8bcdd7cb2142ec1733759b08ed32c60c0755 /arch/arm/plat-omap | |
| parent | 21fe46c428a24d6ad23e8e6a5c0adca5326067c6 (diff) | |
| parent | 597d07ce35b0be4de32939b2e8a1d4967eb4e27b (diff) | |
| download | kernel_samsung_tuna-46a416e609b67e4fe19faa9b66edc3594fbf8674.zip kernel_samsung_tuna-46a416e609b67e4fe19faa9b66edc3594fbf8674.tar.gz kernel_samsung_tuna-46a416e609b67e4fe19faa9b66edc3594fbf8674.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/iommu2.h | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/omap_rpmsg.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/iommu2.h b/arch/arm/plat-omap/include/plat/iommu2.h index 10ad05f..45b2e36 100644 --- a/arch/arm/plat-omap/include/plat/iommu2.h +++ b/arch/arm/plat-omap/include/plat/iommu2.h @@ -36,6 +36,7 @@ #define MMU_READ_CAM 0x68 #define MMU_READ_RAM 0x6c #define MMU_EMU_FAULT_AD 0x70 +#define MMU_GP_REG 0x88 #define MMU_REG_SIZE 256 diff --git a/arch/arm/plat-omap/omap_rpmsg.c b/arch/arm/plat-omap/omap_rpmsg.c index c4d1342..7de18ff 100644 --- a/arch/arm/plat-omap/omap_rpmsg.c +++ b/arch/arm/plat-omap/omap_rpmsg.c @@ -168,7 +168,7 @@ static int omap_rpmsg_mbox_callback(struct notifier_block *this, switch (msg) { case RP_MBOX_CRASH: pr_err("%s has just crashed !\n", rpdev->rproc_name); - /* todo: smarter error handling here */ + rproc_errror_notify(rpdev->rproc); break; case RP_MBOX_ECHO_REPLY: pr_info("received echo reply from %s !\n", rpdev->rproc_name); |