diff for duplicates of <1532325418-22617-3-git-send-email-rppt@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 2d49ceb..47ce4b0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,8 @@ index 7d9bd20..6148ea8 100644 -#ifdef CONFIG_ZONE_DMA32 - if (start <= __pa(MAX_DMA_ADDRESS)) -- mem_data[node].num_dma_physpages +- (min(end, __pa(MAX_DMA_ADDRESS)) - start) >>PAGE_SHIFT; +- mem_data[node].num_dma_physpages += +- (min(end, __pa(MAX_DMA_ADDRESS)) - start) >>PAGE_SHIFT; -#endif start = GRANULEROUNDDOWN(start); end = GRANULEROUNDUP(end); diff --git a/a/content_digest b/N1/content_digest index 7f1d56e..c8e2a34 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01532325418-22617-1-git-send-email-rppt@linux.vnet.ibm.com\0" "From\0Mike Rapoport <rppt@linux.vnet.ibm.com>\0" "Subject\0[PATCH 2/4] ia64: remove unused num_dma_physpages member from 'struct early_node_data'\0" - "Date\0Mon, 23 Jul 2018 05:56:56 +0000\0" + "Date\0Mon, 23 Jul 2018 08:56:56 +0300\0" "To\0Tony Luck <tony.luck@intel.com>" " Fenghua Yu <fenghua.yu@intel.com>\0" "Cc\0Michal Hocko <mhocko@kernel.org>" @@ -40,7 +40,8 @@ " \n" "-#ifdef CONFIG_ZONE_DMA32\n" "-\tif (start <= __pa(MAX_DMA_ADDRESS))\n" - "-\t\tmem_data[node].num_dma_physpages +-\t\t\t(min(end, __pa(MAX_DMA_ADDRESS)) - start) >>PAGE_SHIFT;\n" + "-\t\tmem_data[node].num_dma_physpages +=\n" + "-\t\t\t(min(end, __pa(MAX_DMA_ADDRESS)) - start) >>PAGE_SHIFT;\n" "-#endif\n" " \tstart = GRANULEROUNDDOWN(start);\n" " \tend = GRANULEROUNDUP(end);\n" @@ -48,4 +49,4 @@ "-- \n" 2.7.4 -4730d8897943da13caabe08cd188c26ac5b3316bfd16fd10aad038587eebd33e +df7114ed1aca0bfe992606be57ab34ad9de482af828202f6e6701a014e2cfc9c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.