From: "Jan Beulich" <JBeulich@suse.com>
To: "Dave Airlie" <airlied@linux.ie>
Cc: "Michal Kubecek" <mkubecek@suse.cz>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] agp: fix scratch page cleanup
Date: Thu, 26 Jan 2012 09:45:32 +0000 [thread overview]
Message-ID: <4F212ECC020000780006F26B@nat28.tlf.novell.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1201251900330.12477@skynet.skynet.ie>
>>> On 25.01.12 at 20:01, Dave Airlie <airlied@linux.ie> wrote:
>> In error cleanup of agp_backend_initialize() and in agp_backend_cleanup(),
>> agp_destroy_page() is passed virtual address of the scratch page. This
>> leads to a kernel warning if the initialization fails (or upon regular
>> cleanup) as pointer to struct page should be passed instead.
>
> Jan can you check and ack this if okay? since you wrote this chunk
> originally?
The change here is fine, but rather fixes an omission of your own
"agp: switch AGP to use page array instead of unsigned long array"
(which went in for 2.6.31, whereas my change went into 2.6.26),
which also wasn't noticed when David Woodhouse touched the
code again for 2.6.32 ("agp: Switch agp_{un,}map_page() to take
struct page * argument").
Jan
>>
>> Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
>> ---
>> drivers/char/agp/backend.c | 12 ++++++------
>> 1 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
>> index 4b71647..317c28c 100644
>> --- a/drivers/char/agp/backend.c
>> +++ b/drivers/char/agp/backend.c
>> @@ -194,10 +194,10 @@ static int agp_backend_initialize(struct
> agp_bridge_data *bridge)
>>
>> err_out:
>> if (bridge->driver->needs_scratch_page) {
>> - void *va = page_address(bridge->scratch_page_page);
>> + struct page *page = bridge->scratch_page_page;
>>
>> - bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP);
>> - bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE);
>> + bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_UNMAP);
>> + bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_FREE);
>> }
>> if (got_gatt)
>> bridge->driver->free_gatt_table(bridge);
>> @@ -221,10 +221,10 @@ static void agp_backend_cleanup(struct agp_bridge_data
> *bridge)
>>
>> if (bridge->driver->agp_destroy_page &&
>> bridge->driver->needs_scratch_page) {
>> - void *va = page_address(bridge->scratch_page_page);
>> + struct page *page = bridge->scratch_page_page;
>>
>> - bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP);
>> - bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE);
>> + bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_UNMAP);
>> + bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_FREE);
>> }
>> }
>>
>>
prev parent reply other threads:[~2012-01-26 9:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-25 15:51 [PATCH] agp: fix scratch page cleanup Michal Kubecek
2012-01-25 19:01 ` Dave Airlie
2012-01-26 9:45 ` Jan Beulich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F212ECC020000780006F26B@nat28.tlf.novell.com \
--to=jbeulich@suse.com \
--cc=airlied@linux.ie \
--cc=linux-kernel@vger.kernel.org \
--cc=mkubecek@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).